X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plc.d%2Fdb;h=3b84b5947942f007d19d3a40d0aa46e75be04264;hb=f9bdeed07525fd5b861084165dd8fd451be17c5c;hp=b2f7c3dc3adbf930bf56c5b81948fb0738bae79c;hpb=a4a169a1d8208012648b4380452687f67adff72b;p=plcapi.git

diff --git a/plc.d/db b/plc.d/db
index b2f7c3d..3b84b59 100755
--- a/plc.d/db
+++ b/plc.d/db
@@ -1,6 +1,4 @@
 #!/bin/bash
-# $Id$
-# $URL$
 #
 # priority: 900
 #
@@ -24,13 +22,13 @@ export PGPORT=$PLC_DB_PORT
 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" \
-		  $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)"
@@ -46,7 +44,7 @@ function extend_db()
 	    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