X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plc.d%2Fdb;fp=plc.d%2Fdb;h=644a3ad6464bfa421e7b43ef2c44aaab0275a164;hb=88cae0b8c15eb7f893682c8b63c845a2fc5969da;hp=b2f7c3dc3adbf930bf56c5b81948fb0738bae79c;hpb=16653a77d8f8ed0585890fcc464f743815c3ef75;p=plcapi.git diff --git a/plc.d/db b/plc.d/db index b2f7c3d..644a3ad 100755 --- a/plc.d/db +++ b/plc.d/db @@ -24,10 +24,10 @@ 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 }') @@ -46,7 +46,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