local usevserver=no
local vroot
if [ $vservers_are_available = yes ]; then
- if [ ! -z "$vsname" ]; then
+ if [ -n "$vsname" ]; then
# does it exist ?
if ! vservers_exist "$vsname" ; then
fatal "The vserver given in vsname ($vsname) does not exist."
debug "User home set to: $userhome"
[ -f $userhome/.my.cnf ] || fatal "Can't find config file in $userhome/.my.cnf"
- defaultsfile="--defaults-file=$vuserhome/.my.cnf"
+ defaultsfile="--defaults-file=$userhome/.my.cnf"
debug "using $defaultsfile"
fi
else
execstr="$MYSQLHOTCOPY --quiet --allowold --regexp /.\*/./.\*/ $hotdir"
fi
- debug "su $user -c '$execstr'"
+ debug "su $user -c \"$execstr\""
if [ ! $test ]
then
output=`su $user -c "$execstr" 2>&1`
else
execstr="$MYSQLHOTCOPY --allowold $db $hotdir"
fi
- debug "su $user -c '$execstr'"
+ debug 'su $user -c \"$execstr\"'
if [ ! $test ]
then
output=`su $user -c "$execstr" 2>&1`
then
if [ $usevserver = yes ]
then
- debug "echo show databases | $VSERVER $vsname exec su $user -c $MYSQL $defaultsfile | grep -v Database"
+ debug 'echo show databases | $VSERVER $vsname exec su $user -c \"$MYSQL $defaultsfile\" | grep -v Database'
databases=`echo 'show databases' | $VSERVER $vsname exec su $user -c "$MYSQL $defaultsfile" | grep -v Database`
if [ $? -ne 0 ]
then
else
execstr="$MYSQLDUMP $defaultsfile --lock-tables --complete-insert --add-drop-table --quick --quote-names $ignore $db > $dumpdir/${db}.sql"
fi
- debug "su $user -c '$execstr'"
+ debug "su $user -c \"$execstr\""
if [ ! $test ]
then
output=`su $user -c "$execstr" 2>&1`
fi
# clean up tmp config file
-if [ "$dbusername" != "" ]
+if [ "$dbusername" != "" -a "$dbpassword" != "" ]
then
## clean up tmp config file
debug "rm $mycnf"