From bad6c4811add62d6c3dbd1ca0ef836d7a6fc80fb Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Thu, 24 May 2018 22:53:32 +0400
Subject: [PATCH] sqlmig: corriger le suivi des maj admin

---
 sqlmig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sqlmig b/sqlmig
index f4abe67..684b1bd 100755
--- a/sqlmig
+++ b/sqlmig
@@ -1125,6 +1125,7 @@ if [ -n "$updatedir" ]; then
                 setx name=basename "$update"
                 [ "$dbmode" == devel -o "${name%.devel.sql}" == "$name" ] || continue
                 [ -z "$updatefile" -o "$updatefile" == "$update" ] || continue
+                name="${update#$updatedir/}"
                 mysql_admin_update "$name" "$update" "$updatefile"
             done
             eend; eclearp
@@ -1140,6 +1141,7 @@ if [ -n "$updatedir" ]; then
                 setx name=basename "$update"
                 [ "$dbmode" == devel -o "${name%.devel.sql}" == "$name" ] || continue
                 [ -z "$updatefile" -o "$updatefile" == "$update" ] || continue
+                name="${update#$updatedir/}"
                 oracle_admin_update "$name" "$update" "$updatefile"
             done
             eend; eclearp
@@ -1259,8 +1261,10 @@ for dbdir in "${dbdirs[@]}"; do
             [ "$dbmode" == devel -o "${name%.devel.sql}" == "$name" ] || continue
             [ -z "$updatefile" -o "$updatefile" == "$update" ] || continue
             if have_tag admin "$update"; then
+                [ -n "$updatedir" ] && name="${update#$updatedir/}" || name="${update#$dbdir/}"
                 mysql_admin_update "$name" "$update" "$updatefile"
             else
+                name="${update#$dbdir/}"
                 mysql_user_update "$name" "$update" "$dbname" "$updatefile"
             fi
         done
@@ -1324,8 +1328,10 @@ for dbdir in "${dbdirs[@]}"; do
             [ "$dbmode" == devel -o "${name%.devel.sql}" == "$name" ] || continue
             [ -z "$updatefile" -o "$updatefile" == "$update" ] || continue
             if have_tag admin "$update"; then
+                [ -n "$updatedir" ] && name="${update#$updatedir/}" || name="${update#$dbdir/}"
                 oracle_admin_update "$name" "$update" "$updatefile"
             else
+                name="${update#$dbdir/}"
                 oracle_user_update "$name" "$update" "$dbname" "$updatefile"
             fi
         done