X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fmysql.in;h=a6cd023ae7b422675c342775d9e3c1f3c4557464;hb=99fc759bcc31990e23c4bd974a65f782d3dbd917;hp=f79a0b2b9b235c3bfeb4fd2e83bdc9757f1ff544;hpb=4215d06b05dbfef0adf053f67c7839b6ae343810;p=matthijs%2Fupstream%2Fbackupninja.git diff --git a/handlers/mysql.in b/handlers/mysql.in index f79a0b2..a6cd023 100644 --- a/handlers/mysql.in +++ b/handlers/mysql.in @@ -57,17 +57,21 @@ if [ $usevserver = yes ]; then else vroot="" vexec="" + vsname="" fi +interpolated=`interpolate "$backupdir" "$vsname"` + # create backup dirs, $vroot will be empty if no vsname was specified # and we will instead proceed to operate on the host -[ -d $vroot$backupdir ] || mkdir -p $vroot$backupdir -[ -d $vroot$backupdir ] || fatal "Backup directory '$vroot$backupdir'" -hotdir="$backupdir/hotcopy" -dumpdir="$backupdir/sqldump" +[ -d $vroot$interpolated ] || mkdir -p $vroot$interpolated +[ -d $vroot$interpolated ] || fatal "Backup directory '$vroot$backupdir'" + +hotdir="$interpolated/hotcopy" +dumpdir="$interpolated/sqldump" -[ "$sqldump" == "no" -o -d $vroot$dumpdir ] || $vexec mkdir -p $vroot$dumpdir -[ "$hotcopy" == "no" -o -d $vroot$hotdir ] || $vexec mkdir -p $vroot$hotdir +[ "$sqldump" == "no" -o -d $vroot$dumpdir ] || mkdir -p $vroot$dumpdir +[ "$hotcopy" == "no" -o -d $vroot$hotdir ] || mkdir -p $vroot$hotdir ####################################################################### ## AUTHENTICATION