Fix issue #156

* Unquoted directory names cause failures in shell scripts with `cd` command
datacharmer · Oct 7, 2022 · 05c6d22 · 05c6d22
1 parent 9a0f398
commit 05c6d22
Show file tree

Hide file tree

Showing 30 changed files with 39 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.69.3	07-Oct-2022
+
+### BUGS FIXED
+
+* Fix Issue #156 : unquoted directory names in shell scripts cause failure
+
 ## 1.69.2	04-Sep-2022
 
 ### BUGS FIXED

diff --git a/common/VERSION b/common/VERSION
@@ -1 +1 @@
-1.69.2
+1.69.3
diff --git a/sandbox/templates/import/import_sb_include.gotxt b/sandbox/templates/import/import_sb_include.gotxt
@@ -32,7 +32,7 @@ export MYSQL_TEST_LOGIN_FILE=/tmp/dont_break_my_sandboxes$RANDOM
 
 function is_running
 {
-    cd $SBDIR
+    cd "$SBDIR"
     timeout=5
     elapsed=0
 

diff --git a/sandbox/templates/import/import_test_sb.gotxt b/sandbox/templates/import/import_test_sb.gotxt
@@ -3,7 +3,7 @@
 # Generated by dbdeployer {{.AppVersion}} using {{.TemplateName}} on {{.DateTime}}
 source {{.SandboxDir}}/sb_include
 export LD_LIBRARY_PATH=$CLIENT_LD_LIBRARY_PATH
-cd $SBDIR
+cd "$SBDIR"
 
 fail=0
 pass=0

diff --git a/sandbox/templates/multiple/exec_multi.gotxt b/sandbox/templates/multiple/exec_multi.gotxt
@@ -10,7 +10,7 @@ fi
 
 {{range .Nodes}}
 echo "# server: {{.Node}} "
-  cd $SBDIR/{{.NodeLabel}}{{.Node}}
+  cd "$SBDIR/{{.NodeLabel}}{{.Node}}"
   $@
   cd - > /dev/null
 {{end}}
diff --git a/sandbox/templates/ndb/ndb_start_cluster.gotxt b/sandbox/templates/ndb/ndb_start_cluster.gotxt
@@ -3,7 +3,7 @@
 # Generated by dbdeployer {{.AppVersion}} using {{.TemplateName}} on {{.DateTime}}
 SBDIR={{.SandboxDir}}
 BASEDIR={{.Basedir}}
-cd $SBDIR
+cd "$SBDIR"
 
 if [ ! -d ndb_conf ]
 then

diff --git a/sandbox/templates/ndb/ndb_stop_cluster.gotxt b/sandbox/templates/ndb/ndb_stop_cluster.gotxt
@@ -6,7 +6,7 @@ SBDIR={{.SandboxDir}}
 BASEDIR={{.Basedir}}
 CLIENT_BASEDIR={{.ClientBasedir}}
 
-cd $SBDIR
+cd "$SBDIR"
 
 if [ -f cluster_initialized ]
 then

diff --git a/sandbox/templates/replication/exec_all.gotxt b/sandbox/templates/replication/exec_all.gotxt
@@ -11,7 +11,7 @@ fi
 if [ -z "$ONLY_SLAVES" -o -n "$ONLY_MASTER" ] 
 then
 	echo "# {{.MasterLabel}}  "
-	cd $SBDIR/{{.MasterLabel}}
+	cd "$SBDIR/{{.MasterLabel}}"
     $@
     cd - > /dev/null
 fi
@@ -20,7 +20,7 @@ if [ -z "$ONLY_MASTER" -o -n "$ONLY_SLAVES" ]
 then
 {{range .Slaves}}
 	echo "# server: {{.Node}} "
-	cd $SBDIR/{{.NodeLabel}}{{.Node}}
+	cd "$SBDIR/{{.NodeLabel}}{{.Node}}"
     $@
     cd - > /dev/null
 {{end}}

diff --git a/sandbox/templates/replication/init_slaves.gotxt b/sandbox/templates/replication/init_slaves.gotxt
@@ -5,7 +5,7 @@
 # Don't use directly.
 # This script is called by 'start_all' when needed
 SBDIR={{.SandboxDir}}
-cd $SBDIR
+cd "$SBDIR"
 # workaround for Bug#89959
 $SBDIR/{{.MasterLabel}}/use -h {{.MasterIp}} -u {{.RplUser}} -p{{.RplPassword}} -e 'set @a=1'
 if [ ! -f needs_initialization ]

diff --git a/sandbox/templates/replication/multi_source.gotxt b/sandbox/templates/replication/multi_source.gotxt
@@ -2,7 +2,7 @@
 {{.Copyright}}
 # Generated by dbdeployer {{.AppVersion}} using {{.TemplateName}} on {{.DateTime}}
 SBDIR={{.SandboxDir}}
-cd $SBDIR
+cd "$SBDIR"
 
 $SBDIR/use_all 'reset master'
 

diff --git a/sandbox/templates/replication/multi_source_exec_masters.gotxt b/sandbox/templates/replication/multi_source_exec_masters.gotxt
@@ -2,15 +2,15 @@
 {{.Copyright}}
 # Generated by dbdeployer {{.AppVersion}} using {{.TemplateName}} on {{.DateTime}}
 SBDIR={{.SandboxDir}}
-cd $SBDIR
+cd "$SBDIR"
 
 MASTERS="{{.MasterList}}"
 SLAVES="{{.SlaveList}}"
 
 for N in $MASTERS
 do
 	echo "# server: $N"
-	cd $SBDIR/{{.NodeLabel}}$N
+	cd "$SBDIR/{{.NodeLabel}}$N"
     $@
     cd - > /dev/null
 done
diff --git a/sandbox/templates/replication/multi_source_exec_slaves.gotxt b/sandbox/templates/replication/multi_source_exec_slaves.gotxt
@@ -2,15 +2,15 @@
 {{.Copyright}}
 # Generated by dbdeployer {{.AppVersion}} using {{.TemplateName}} on {{.DateTime}}
 SBDIR={{.SandboxDir}}
-cd $SBDIR
+cd "$SBDIR"
 
 MASTERS="{{.MasterList}}"
 SLAVES="{{.SlaveList}}"
 
 for N in $SLAVES
 do
 	echo "# server: $N"
-	cd $SBDIR/{{.NodeLabel}}$N
+	cd "$SBDIR/{{.NodeLabel}}$N"
     $@
     cd - > /dev/null
 done
diff --git a/sandbox/templates/replication/multi_source_test.gotxt b/sandbox/templates/replication/multi_source_test.gotxt
@@ -2,7 +2,7 @@
 {{.Copyright}}
 # Generated by dbdeployer {{.AppVersion}} using {{.TemplateName}} on {{.DateTime}}
 SBDIR={{.SandboxDir}}
-cd $SBDIR
+cd "$SBDIR"
 
 pass=0
 fail=0

diff --git a/sandbox/templates/replication/multi_source_use_masters.gotxt b/sandbox/templates/replication/multi_source_use_masters.gotxt
@@ -2,7 +2,7 @@
 {{.Copyright}}
 # Generated by dbdeployer {{.AppVersion}} using {{.TemplateName}} on {{.DateTime}}
 SBDIR={{.SandboxDir}}
-cd $SBDIR
+cd "$SBDIR"
 
 MASTERS="{{.MasterList}}"
 

diff --git a/sandbox/templates/replication/multi_source_use_slaves.gotxt b/sandbox/templates/replication/multi_source_use_slaves.gotxt
@@ -2,7 +2,7 @@
 {{.Copyright}}
 # Generated by dbdeployer {{.AppVersion}} using {{.TemplateName}} on {{.DateTime}}
 SBDIR={{.SandboxDir}}
-cd $SBDIR
+cd "$SBDIR"
 
 MASTERS="{{.MasterList}}"
 SLAVES="{{.SlaveList}}"

diff --git a/sandbox/templates/replication/semi_sync_start.gotxt b/sandbox/templates/replication/semi_sync_start.gotxt
@@ -6,7 +6,7 @@
 SBDIR={{.SandboxDir}}
 sleep 2
 set -x
-cd $SBDIR
+cd "$SBDIR"
 $SBDIR/{{.MasterLabel}}/use -u root -e 'set global rpl_semi_sync_master_enabled=1'
 echo "rpl_semi_sync_master_enabled=1" >> $SBDIR/{{.MasterLabel}}/my.sandbox.cnf
 {{ range .Slaves }}

diff --git a/sandbox/templates/replication/test_replication.gotxt b/sandbox/templates/replication/test_replication.gotxt
@@ -2,7 +2,7 @@
 {{.Copyright}}
 # Generated by dbdeployer {{.AppVersion}} using {{.TemplateName}} on {{.DateTime}}
 SBDIR={{.SandboxDir}}
-cd $SBDIR
+cd "$SBDIR"
 
 if [ -x ./{{.MasterAbbr}} ]
 then

diff --git a/sandbox/templates/single/add_option.gotxt b/sandbox/templates/single/add_option.gotxt
@@ -5,7 +5,7 @@ source {{.SandboxDir}}/sb_include
 export LD_LIBRARY_PATH=$CLIENT_LD_LIBRARY_PATH
 
 curdir=$SBDIR
-cd $curdir
+cd "$curdir"
 
 if [ -z "$*" ]
 then

diff --git a/sandbox/templates/single/clear.gotxt b/sandbox/templates/single/clear.gotxt
@@ -4,7 +4,7 @@
 source {{.SandboxDir}}/sb_include
 export LD_LIBRARY_PATH=$CLIENT_LD_LIBRARY_PATH
 
-cd $SBDIR
+cd "$SBDIR"
 
 #
 # attempt to drop databases gracefully

diff --git a/sandbox/templates/single/clone_from.gotxt b/sandbox/templates/single/clone_from.gotxt
@@ -2,7 +2,7 @@
 {{.Copyright}}
 # Generated by dbdeployer {{.AppVersion}} using {{.TemplateName}} on {{.DateTime}}
 source {{.SandboxDir}}/sb_include
-cd $SBDIR
+cd "$SBDIR"
 
 donor_sandbox=$1
 if [ -z "$donor_sandbox" ]

diff --git a/sandbox/templates/single/init_db.gotxt b/sandbox/templates/single/init_db.gotxt
@@ -7,7 +7,7 @@ export DATADIR=$SBDIR/data
 export LD_LIBRARY_PATH=$BASEDIR/lib:$BASEDIR/lib/mysql:$LD_LIBRARY_PATH
 export DYLD_LIBRARY_PATH=$BASEDIR/lib:$BASEDIR/lib/mysql:$DYLD_LIBRARY_PATH
 
-cd $SBDIR
+cd "$SBDIR"
 if [ -d $DATADIR/mysql ]
 then
     echo "Initialization already done."

diff --git a/sandbox/templates/single/replicate_from.gotxt b/sandbox/templates/single/replicate_from.gotxt
@@ -3,7 +3,7 @@
 # Generated by dbdeployer {{.AppVersion}} using {{.TemplateName}} on {{.DateTime}}
 source {{.SandboxDir}}/sb_include
 
-cd $SBDIR
+cd "$SBDIR"
 
 active_replication=$SBDIR/active_replication
 remove_replication=$SBDIR/remove_replication

diff --git a/sandbox/templates/single/show_binlog.gotxt b/sandbox/templates/single/show_binlog.gotxt
@@ -5,7 +5,7 @@ source {{.SandboxDir}}/sb_include
 export LD_LIBRARY_PATH=$CLIENT_LD_LIBRARY_PATH
 
 curdir=$SBDIR
-cd $curdir
+cd "$curdir"
 
 if [ ! -d ./data ]
 then

diff --git a/sandbox/templates/single/show_log.gotxt b/sandbox/templates/single/show_log.gotxt
@@ -3,7 +3,7 @@
 # Generated by dbdeployer {{.AppVersion}} using {{.TemplateName}} on {{.DateTime}}
 source {{.SandboxDir}}/sb_include
 
-cd $SBDIR
+cd "$SBDIR"
 
 if [ ! -d ./data ]
 then

diff --git a/sandbox/templates/single/show_relaylog.gotxt b/sandbox/templates/single/show_relaylog.gotxt
@@ -4,7 +4,7 @@
 source {{.SandboxDir}}/sb_include
 export LD_LIBRARY_PATH=$CLIENT_LD_LIBRARY_PATH
 curdir=$SBDIR
-cd $curdir
+cd "$curdir"
 
 if [ ! -d ./data ]
 then

diff --git a/sandbox/templates/single/start.gotxt b/sandbox/templates/single/start.gotxt
@@ -37,9 +37,9 @@ else
         rm -f $PIDFILE
     fi
     CURDIR=$(pwd)
-    cd $BASEDIR
+    cd "$BASEDIR"
     $MYSQLD_SAFE --defaults-file=$SBDIR/my.sandbox.cnf $CUSTOM_MYSQLD $@ > "$SBDIR/start.log" 2>&1 &
-    cd $CURDIR
+    cd "$CURDIR"
     ATTEMPTS=1
     while [ ! -f $PIDFILE ]
     do

diff --git a/sandbox/templates/single/sysbench.gotxt b/sandbox/templates/single/sysbench.gotxt
@@ -5,7 +5,7 @@ source {{.SandboxDir}}/sb_include
 
 [ -z "$SB_DATABASE" ] && SB_DATABASE=test
 
-cd $SBDIR
+cd "$SBDIR"
 ./use -e "CREATE DATABASE IF NOT EXISTS $SB_DATABASE"
 sysbench --db-driver=mysql \
 	--mysql-user={{.DbUser}} \

diff --git a/sandbox/templates/single/sysbench_ready.gotxt b/sandbox/templates/single/sysbench_ready.gotxt
@@ -34,7 +34,7 @@ then
     exit 1
 fi
 
-cd $SBDIR
+cd "$SBDIR"
 ./use -e "CREATE DATABASE IF NOT EXISTS $SB_DATABASE"
 case $option in
     prepare)

diff --git a/sandbox/templates/single/test_sb.gotxt b/sandbox/templates/single/test_sb.gotxt
@@ -3,7 +3,7 @@
 # Generated by dbdeployer {{.AppVersion}} using {{.TemplateName}} on {{.DateTime}}
 source {{.SandboxDir}}/sb_include
 export LD_LIBRARY_PATH=$CLIENT_LD_LIBRARY_PATH
-cd $SBDIR
+cd "$SBDIR"
 
 fail=0
 pass=0

diff --git a/sandbox/templates/single/wipe_and_restart.gotxt b/sandbox/templates/single/wipe_and_restart.gotxt
@@ -2,7 +2,7 @@
 {{.Copyright}}
 # Generated by dbdeployer {{.AppVersion}} using {{.TemplateName}} on {{.DateTime}}
 source {{.SandboxDir}}/sb_include
-cd $SBDIR
+cd "$SBDIR"
 if [ -f no_clear ]
 then
     echo "This sandbox ($(basename $SBDIR)) is locked"