git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
running accessors before db not working (misses admin account)
[plcapi.git]
/
plc.d
/
db
diff --git
a/plc.d/db
b/plc.d/db
index
b2f7c3d
..
3b84b59
100755
(executable)
--- a/
plc.d/db
+++ b/
plc.d/db
@@
-1,6
+1,4
@@
#!/bin/bash
#!/bin/bash
-# $Id$
-# $URL$
#
# priority: 900
#
#
# priority: 900
#
@@
-24,13
+22,13
@@
export PGPORT=$PLC_DB_PORT
function extend_db()
{
shopt -s nullglob
function extend_db()
{
shopt -s nullglob
- for file in /usr/share/plc_api/extensions/*-up; do
- script=${file#*/}
- name=${script%-up}
- extension=${script##*}
+ for file in /usr/share/plc_api/extensions/*-up
*
; do
+ script=${file#
#
*/}
+ name=${script%-up
*
}
+ extension=${script##*
.
}
version=$(psql -U $PLC_DB_USER --quiet --tuples-only --no-align -c \
"SELECT version FROM plc_db_extensions WHERE name='$name' LIMIT 1" \
version=$(psql -U $PLC_DB_USER --quiet --tuples-only --no-align -c \
"SELECT version FROM plc_db_extensions WHERE name='$name' LIMIT 1" \
- $PLC_DB_NAME 2>/dev/null | awk '/^[0-9]+$/ { ver=$1 } END { print ver }')
+ $PLC_DB_NAME 2>/dev/null | awk '
BEGIN { ver=0 }
/^[0-9]+$/ { ver=$1 } END { print ver }')
if [ $version -eq 0 ]; then
if [ "$extension" = "sql" ] ; then
dialog " - $script (dbdumped)"
if [ $version -eq 0 ]; then
if [ "$extension" = "sql" ] ; then
dialog " - $script (dbdumped)"
@@
-46,7
+44,7
@@
function extend_db()
check
fi
for file in /usr/share/plc_api/extensions/$name/migrations/[0-9]*-up-*; do
check
fi
for file in /usr/share/plc_api/extensions/$name/migrations/[0-9]*-up-*; do
- script=${file#*/}
+ script=${file#
#
*/}
index=${script%-up-*}
extension=${script##*.}
if [ $index -gt $version ] ; then
index=${script%-up-*}
extension=${script##*.}
if [ $index -gt $version ] ; then