Fiabilisation du nouveau script database/update/db-update.sh (v3.7.9.72)

Etienne Pallier
1 parent 568c060d
Showing 3 changed files with 17 additions and 19 deletions Show diff stats
CHANGES.txt
README.md
database/update/db-update.sh
@@ -72,6 +72,10 @@ Outre ces changements, voici d&#39;autres changements importants :
 ======= CHANGES =======
 -------
+24/07/2020	v3.7.9.72 (EP)
+	- (i) Fiabilisation du nouveau script database/update/db-update.sh
+
+-------
 23/07/2020	v3.7.9.69-71 (EP)
 	- (b) Bugfix OrganismesController getArticle => public
 	- .gitignore modifs : ignorer dossier Eclipse .metadata/...
@@ -42,8 +42,8 @@ Logiciel testé et validé sur les configurations suivantes :
 --------------------------------------------------------------------------------------------
-Date: 23/07/2020
-Version: 3.7.9.71
+Date: 24/07/2020
+Version: 3.7.9.72
 HISTORIQUE DES CHANGEMENTS DE VERSION : voir le fichier CHANGES.txt (ou la page web /pages/changes)
@@ -2,7 +2,7 @@
 # Pour Mac OS recent (>=10.10, Yosemite), la syntaxe du SED est differente
 # Il faut donc exécuter ce script de la manière suivante :
-# ./macos-db-update.sh <ce_script.sh>
+# ./macos-db-update.sh <ce_script.sh> db-update-AAAA-MM-JJ.sql
 if [ ! -f ../../config/app.php ] ; then
@@ -26,10 +26,10 @@ function abort() {
 # Exit si ce script n'existe pas
-#if [[ ! -f ./script_sql/$sqlscript ]] ; then
-if [[ ! -f ./$sqlscript ]] ; then
-	#echo "Le script SQL script_sql/$sqlscript n'existe pas" 
-	echo "Le script SQL $sqlscript n'existe pas" 
+# Juste le nom du script sql, sans le path qui pourrait être devant
+sqlscript=$(basename $sqlscript)
+if [[ ! -f ./script_sql/$sqlscript ]] ; then
+	echo "Le script SQL ./script_sql/$sqlscript n'existe pas" 
 	abort
 fi
@@ -39,10 +39,6 @@ sqlscript_name=${sqlscript%%.*}
 #echo $sqlscript_name
-
-
-
-
 # Get login, pass, dbname, and hostname
 username=$(grep "/\*d\*/'username'" ../../config/app.php | cut -d"'" -f4) || abort
 password=$(grep "/\*d\*/'password'" ../../config/app.php | cut -d"'" -f4) || abort
@@ -52,21 +48,19 @@ host=$(grep &quot;/\*d\*/&#39;host&#39;&quot; ../../config/app.php | cut -d&quot;&#39;&quot; -f4) || abort
 #cp -p ./script_sql/db-update-2016-07-01-irap.sql ./script_sql/db-update-2016-07-01-irap-build.sql
 #cp -p ./script_sql/$sqlscript.sql ./script_sql/$sqlscript-build.sql || abort
-#cp -p ./script_sql/$sqlscript_name.sql ./script_sql/$sqlscript_name-build.sql || abort
-cp -p ./$sqlscript_name.sql ./$sqlscript_name-build.sql || abort
+cp -p ./script_sql/$sqlscript_name.sql ./script_sql/$sqlscript_name-build.sql || abort
+#ls -l ./script_sql/
 # Execute sql update script
-#sed -e "s/database/$database/" -i ./script_sql/$sqlscript-build.sql || abort
-sed -e "s/database/$database/" -i ./$sqlscript_name-build.sql || abort
+sed -e "s/database/$database/" -i ./script_sql/$sqlscript_name-build.sql || abort
-#mysql --user=$username --password=$password -h $host < ./script_sql/$sqlscript_name-build.sql || abort
-mysql --user=$username --password=$password -h $host < ./$sqlscript_name-build.sql || abort
+mysql --user=$username --password=$password -h $host < ./script_sql/$sqlscript_name-build.sql || abort
 # Delete temporary file and cakephp cache (-f avoids warning if no file)
-#rm -f ./script_sql/$sqlscript_name-build.sql
-rm -f ./$sqlscript_name-build.sql
+rm -f ./script_sql/$sqlscript_name-build.sql
 sudo rm -f ../../tmp/cache/models/*
 sudo rm -f ../../tmp/cache/persistent/*
+#ls -l ./script_sql/
 # Faire ca aussi si ca suffit pas...
 #sudo chmod -R 777 ../../tmp