diff --git a/package_check.sh b/package_check.sh index 6ead0c8..22c0d7b 100755 --- a/package_check.sh +++ b/package_check.sh @@ -59,7 +59,7 @@ then else # Reduce the arguments for getopts arguments="$*" - arguments=${arguments//--branch=/-b } + arguments=${arguments//--branch=/-b} arguments=${arguments//--force-install-ok/-f} arguments=${arguments//--interrupt/-i} arguments=${arguments//--help/-h} @@ -80,7 +80,7 @@ else case $parameter in b) # --branch=branch-name - gitbranch="$OPTARG" + gitbranch="-b $OPTARG" ;; f) # --force-install-ok diff --git a/sub_scripts/testing_process.sh b/sub_scripts/testing_process.sh index 677d3e3..a180807 100644 --- a/sub_scripts/testing_process.sh +++ b/sub_scripts/testing_process.sh @@ -1020,12 +1020,12 @@ CHECK_BACKUP_RESTORE () { then # Uses the default snapshot current_snapshot=snap0 + # Place the copy of the backup archive in the container. + sudo mv -f ./archives /var/lib/lxcsnaps/$lxc_name/$current_snapshot/rootfs/home/yunohost.backup/ + # Stop and restore the LXC container LXC_STOP - # Place the copy of the backup archive in the container. - sudo mv -f ./archives /var/lib/lxc/$lxc_name/rootfs/home/yunohost.backup/ - ECHO_FORMAT "\nRestore on a clean YunoHost system...\n" "white" "bold" clog fi