Create backup whitelist for docker-compose

scripts/Common/OS/backup.fish

@@ -37,7 +37,7 @@ function backupAction -V dir
         echo
     end
 
-    read -xP "Please specify the path to the directory to save the backup to: " VALHALLA_BACKUP_DIR
+    read -xP "Please specify the path to the directory to save the backup to: " BACKUP_DIR
 
     runHook backupSoftware || begin
         echo "Backing up software..."

scripts/lib/restoration.fish

@@ -1,14 +1,7 @@
 function backupFiles
     if [ -n "$VALHALLA_BACKUP_DIR" ]
-        argparse -i "base-directory=" -- $argv
+        argparse -i "u/user=" "n/name=" "base-directory=" -- $argv
         set -l tarArgs
-        set -l path (getArchivePath $argv)
-        set -l dir (dirname "$path")
-        argparse -i "u/user=" "n/name=" -- $argv
-    
-        if runRestorationCommand test ! -d "$dir"
-            runRestorationCommand mkdir -p "$dir"
-        end
     
         if [ -n "$_flag_base_directory" ]
             set -a argv --base-directory "$_flag_base_directory"
@@ -17,7 +10,7 @@ function backupFiles
             set -a tarArgs -P
         end
     
-        sudo tar $tarArgs -cv (fd $argv) | createArchive "$path"
+        tar $tarArgs -cvz (fd $argv) | createArchive $argv --user "$_flag_user" --name "$_flag_name"
     end
 end
 
@@ -38,12 +31,18 @@ function restoreFiles
         end
 
         fetchArchive $argv | begin
-            sudo $sudoArgs tar $tarArgs -xv
+            sudo $sudoArgs tar $tarArgs -xvz
         end
     end
 end
 
-function createArchive -a path
+function createArchive
+    set -l path (getArchivePath $argv)
+
+    if [ ! -d (dirname "$path") ]
+        mkdir -p (dirname "$path")
+    end
+
     runRestorationCommand tee "$path" >/dev/null
 end
 
@@ -62,7 +61,7 @@ function runRestorationCommand
             set -a args -p $VALHALLA_BACKUP_SERVER_PORT
         end
 
-        ssh $args "$VALHALLA_BACKUP_SERVER" (string escape -- $argv)
+        ssh $args "$VALHALLA_BACKUP_SERVER" $argv
     end
 end