Merge pull request #140 from ici0/master

fix timestamp bug; fix duplicate os detection

Author: mrrfv

functions/backup_func.sh

@@ -128,9 +128,10 @@ function backup_func() {
     cecho "Skipping compression & encryption due to the 'discouraged_disable_archive' option being set to 'yes'."
     cecho "The backup data will be stored in a directory instead."
     # TODO: clean up the code, i.e. remove the repetition
-    declare backup_archive="$archive_path/open-android-backup-$(date +%m-%d-%Y-%H-%M-%S)"
-    mkdir -p "$archive_path/open-android-backup-$(date +%m-%d-%Y-%H-%M-%S)"
-    mv ./backup-tmp "$archive_path/open-android-backup-$(date +%m-%d-%Y-%H-%M-%S)"
+    backup_timestamp=$(date +%m-%d-%Y-%H-%M-%S)
+    declare backup_archive="$archive_path/open-android-backup-$backup_timestamp"
+    mkdir -p "$archive_path/open-android-backup-$backup_timestamp"
+    mv ./backup-tmp "$archive_path/open-android-backup-$backup_timestamp"
   else
     # Compress
     cecho "Compressing & encrypting data - this will take a while."

functions/restore_func.sh

@@ -75,27 +75,26 @@ function restore_func() {
     # Apps containing their own directories may contain split APKs, which need to be installed using adb install-multiple.
     # Those without directories were created by past versions of this script and need to be imported the traditional way.
 
+    # Determine OS and set a command to install apks
+    if [[ "$(uname -r | sed -n 's/.*\( *Microsoft *\).*/\1/ip')" ]]; then
+      cecho "Windows/WSL detected"
+      install_cmd="timeout 900 ./windows-dependencies/adb/adb.exe install-multiple"
+    elif [[ "$(uname)" == "Darwin" ]]; then
+      cecho "macOS detected"
+      install_cmd="gtimeout 900 adb install-multiple"
+    else
+      cecho "Linux detected"
+      install_cmd="timeout 900 adb install-multiple"
+    fi
     # Handle split APKs
     # Find directories in the Apps directory
     apk_dirs=$(find ./backup-tmp/Apps -mindepth 1 -maxdepth 1 -type d)
     for apk_dir in $apk_dirs; do
       # Install all APKs in the directory
       # the APK files are sorted to ensure that base.apk is installed before split APKs
       apk_files=$(find "$apk_dir" -type f -name "*.apk" | sort | tr '\n' ' ')
-      if [[ "$(uname -r | sed -n 's/.*\( *Microsoft *\).*/\1/ip')" ]]; then
-        cecho "Windows/WSL detected"
-        # shellcheck disable=SC2086
-        timeout 900 ./windows-dependencies/adb/adb.exe install-multiple $apk_files
-      else
-        cecho "macOS/Linux detected"
-        if [[ "$(uname)" == "Darwin" ]]; then
-          timeout_cmd="gtimeout"
-        else
-          timeout_cmd="timeout"
-        fi
-        # shellcheck disable=SC2086
-        $timeout_cmd 900 adb install-multiple $apk_files
-      fi
+      # shellcheck disable=SC2086
+      $install_cmd $apk_files
     done
 
     # Now all that's left is ensuring backwards compatibility with old backups