More fixes for backuptool

bin/backuptool

@@ -328,7 +328,6 @@ restorebackup_allservices() {
   for i in "${SERVICES[@]}"; do
     echo "** Restoring $i to /federated.restore/apps/$i.."
     PASSPHRASE=$GPG_PASSPHRASE duplicity --force b2://$B2_APPLICATION_KEY_ID:$B2_APPLICATION_KEY@fed-customers/$UUID/federated/apps/$i/ /federated.restore/apps/$i
-    [ $? -ne 0 ] && failcheck "* Couldn't restore files"
   done
 }
 restorebackup_nfsmounts() {
@@ -371,13 +370,13 @@ while getopts "lbdr" OPTION; do
   esac
 done
 
-[ $# -gt 3 ] || [ $# -lt 1 ] && usage
+[ $# -gt 4 ] || [ $# -lt 1 ] && usage
 SERVICE=$2
 
 if [ $# -ge 3 ]; then
   PASSKEY=$2
-  SERVICE=$3
-  BACKUPHOST=$4
+  BACKUPHOST=$3
+  SERVICE=$4
 fi
 
 if [ -f "/federated/bin/.gpg.backblaze" ]; then