Init restore function added;

path correction function added

helium_helper.sh

@@ -44,9 +44,9 @@ REMOTE_REPO_URL=https://lab.c95.org/fr4nz/helium-helper/raw/branch/$REMOTE_REPO_
 REMOTE_SCRIPT_URL=$REMOTE_REPO_URL/$SCRIPT_FILE_NAME
 APP_SOURCE_URL=https://api.github.com/repos/imputnet/helium-linux/releases/latest
 
-########## FUNCTIONS ###########
+########################### FUNCTIONS ############################
 
-### DEPENDENCIES
+#################### DEPENDENCY CHECK ####################
 cmd_query() { 
      if ! command -v $PACKAGE > /dev/null 2>&1 ; then
         echo "  - $PACKAGE" >> $TMP/missingDeps
@@ -68,7 +68,7 @@ dependency_check () {
     fi
 }
 
-### SHELL CHECK
+#################### SHELL CHECK ####################
 shell_query() {
     if [ "$(echo $SHELL | grep "$SHELL_OPTION")" ] ; then
         ACTIVE_SHELL=$SHELL_OPTION
@@ -84,7 +84,7 @@ shell_check() {
     done
 }
 
-### ARCH CHECK
+#################### ARCH CHECK ####################
 arch_check() {
     if [ "$ARCH_OVERRIDE" ] ; then
         ARCH=$ARCH_OVERRIDE
@@ -105,7 +105,7 @@ arch_check() {
     fi
 }
 
-### CHECK LOCAL INSTALL
+#################### LOCAL INSTALL CHECK ####################
 local_check() {
     if ! [ -d "$INSTALL_PATH" ] ; then
         echo -e "\n  ${YEL}$APP_NAME_LONG directory not found!${CRS}\n"
@@ -119,7 +119,33 @@ local_check() {
     fi
 }
 
-### INSTALL
+#################### VARIABLE CHECK ####################
+path_correction() {
+    if [ "$TARGET" == "INSTALL" ] ; then
+        TARGET_PATH=$INSTALL_PATH
+
+    elif [ "$TARGET" == "BACKUP" ] ; then
+        TARGET_PATH=$BACKUP_PATH
+    fi
+
+    if ! [ ${TARGET_PATH:0:1} == "/" ] ; then
+        TARGET_PATH=$(pwd)/$TARGET_PATH
+    fi
+
+    REVERSE_PATH=$(echo $TARGET_PATH | rev)
+    if [ "${REVERSE_PATH:0:1}" == "/" ] ; then
+        TARGET_PATH=$(echo $TARGET_PATH | sed "s|.$||")
+    fi
+
+    if [ "$TARGET" == "INSTALL" ] ; then
+        INSTALL_PATH=$TARGET_PATH
+
+    elif [ "$TARGET" == "BACKUP" ] ; then
+        BACKUP_PATH=$TARGET_PATH
+    fi
+}
+
+#################### INSTALL ####################
 install_application() {
     if [ -f "$INSTALL_PATH/$APP_NAME.$FILE_EXTENSION" ] ; then
         echo -e "  ${YEL}$APP_NAME_LONG AppImage found! Trying to update...${CRS}"
@@ -152,7 +178,7 @@ install_application() {
     done
 }
 
-### LAUNCHER
+#################### LAUNCHER ####################
 add_launcher() {
     if [ -f "$LAUNCHER_PATH/$APP_NAME.desktop" ] ; then
         echo -e "\n  ${YEL}${APP_NAME}.desktop already exists!${CRS}"
@@ -205,7 +231,7 @@ add_launcher() {
     fi
 }
 
-### ALIAS
+#################### ALIAS ####################
 add_alias() {
     if ! [ -f "$SCRIPT_PATH/$SCRIPT_FILE_NAME" ] ; then
         mkdir -p $SCRIPT_PATH
@@ -257,7 +283,7 @@ add_alias() {
     fi
 }
 
-### UPDATE
+#################### UPDATE ####################
 update_application() {
     LOCAL_VERSION=$($INSTALL_PATH/$APP_NAME.$FILE_EXTENSION --version | awk '{print $2}')
     APP_SOURCE_VERSION=$(curl -s $APP_SOURCE_URL | grep "tag_name" | tr -d \", | awk '{print $2}')
@@ -316,9 +342,10 @@ update_application() {
     fi
 }
 
-### BACKUP
+#################### BACKUP ####################
 call_backup() {
-    if [ $(ls $BACKUP_PATH\/$APP_NAME\.$BACKUP_METHOD\.backup_* | wc -l) -gt "1" ] ; then
+    BACKUP_COUNT=$(ls $BACKUP_PATH/$APP_NAME.$BACKUP_METHOD.backup_* 2> /dev/null | wc -l)
+    if [[ "$BACKUP_COUNT" -gt "0" ]] ; then
         echo -e "\n  ${CYN}A $BACKUP_METHOD backup already exists!${CRS}\n"
 
         while true ; do
@@ -521,28 +548,54 @@ pack_backup() {
     fi
 }
 
-### RESTORE BACKUP
+#################### RESTORE BACKUP ####################
-restore_backup() {
+select_backup() {
-    if [ $(ls $BACKUP_PATH\/$APP_NAME\.*.backup_* | wc -l) -gt "1" ] ; then
+    BACKUP_COUNT=$(ls $BACKUP_PATH/$APP_NAME.$BACKUP_TYPE.backup_* 2> /dev/null | wc -l)
-        NUMBER=1
+    if [ "$BACKUP_COUNT" -gt "1" ] ; then
+        i=1
         mkdir -p $TMP/backup_restore
         CWD=$(pwd)
         cd $BACKUP_PATH
-        RESTORE_OPTIONS=$(ls -lt $APP_NAME\.*.backup_* | awk '{print $9}')
+        RESTORE_OPTIONS=$(ls -lt $APP_NAME\.$BACKUP_TYPE\.backup_* | awk '{print $9}')
 
         for RESTORE_TARGET in ${RESTORE_OPTIONS[@]} ; do
-            echo "$NUMBER - $RESTORE_TARGET" >> $TMP/backup_restore/options
+            echo "    $i - $RESTORE_TARGET" >> $TMP/backup_restore/options
-            NUMBER=$(($NUMBER+1))
+            i=$(($i+1))
         done
 
         cd $CWD
-        echo -e "$(cat $TMP/backup_restore/options)"
+        echo -e "  ${CYN}Choose one of the $BACKUP_COUNT options below${CRS}\n"
-        rm -rf $TMP
+        echo -e "$(cat $TMP/backup_restore/options)\n"
-    fi
 
+        while true ; do
+            read -p "  Enter backup ID (1-$BACKUP_COUNT) or exit : " RESTORE_SELECT
+
+            if [[ "$RESTORE_SELECT" -le "$BACKUP_COUNT" && "$RESTORE_SELECT" -gt "0" ]] ; then
+                RESTORE_FILE=$(sed -n $RESTORE_SELECT\p $TMP/backup_restore/options | awk '{print $3}')
+                RESTORE_SOURCE=$BACKUP_PATH/$RESTORE_FILE
+                echo $RESTORE_SOURCE
+                break
+
+            elif [[ "$RESTORE_SELECT" == "exit" || "$RESTORE_SELECT" == "EXIT" ]] ; then
+                echo
+                exit_clean
+            
+            else
+                echo -e "\n  ${YEL}Invalid response!${CRS}\n"
+            fi
+        done
+    
+    elif [ "$BACKUP_COUNT" -lt "1" ] ; then
+        echo -e "  ${RED}No backup archive found in ${CYN}$BACKUP_PATH${RED}!${CRS}"
+        exit_clean
+    
+    else
+        RESTORE_SOURCE=$(ls $BACKUP_PATH/$APP_NAME.$BACKUP_TYPE.backup_*)
+        echo $RESTORE_SOURCE
+    fi
 }
 
-### REMOVE
+#################### REMOVE ####################
 remove_application() {
     if [ -d "$INSTALL_PATH" ] ; then
 
@@ -587,11 +640,11 @@ remove_application() {
                 break
 
             elif [[ "$CONFIRM_REMOVE" == "n" || "$CONFIRM_REMOVE" == "N" ]] ; then
-                echo -e "  ${RED}Cancelled!${CRS}"
+                echo -e "\n  ${RED}Cancelled!${CRS}"
                 exit
 
             else
-                echo -e "  ${YEL}Invalid response!${CRS}\n"
+                echo -e "\n  ${YEL}Invalid response!${CRS}\n"
             fi
         done
 
@@ -601,12 +654,12 @@ remove_application() {
     fi
 }
 
-### SCRIPT VERSION
+#################### SCRIPT VERSION ####################
 script_version() {
     echo -e "\n  ${CYN}$APP_NAME_LONG Helper Script Version :  ${CRS}$SCRIPT_VERSION\n"
 }
 
-### UPDATE SCRIPT
+#################### UPDATE SCRIPT ####################
 scrip_version_info() {
     echo -e "  - ${CYN}Local Version :\t${CRS}$SCRIPT_VERSION"
     echo -e "  - ${CYN}Remote Version :\t${CRS}$REMOTE_SCRIPT_VERSION"
@@ -697,7 +750,7 @@ update_script() {
     fi
 }
 
-### COMPARE APP VERSION
+#################### COMPARE APP VERSION ####################
 app_version_info() {
     echo -e "  - ${CYN}Local Version :\t${CRS}$LOCAL_VERSION"
     echo -e "  - ${CYN}$APP_SOURCE Version :\t${CRS}$APP_SOURCE_VERSION\n"
@@ -733,17 +786,18 @@ compare_version() {
     fi
 }
 
-### HELP
+#################### HELP ####################
 help() {
     echo -e "\n${LCY}${SCRIPT_NAME}${CRS}\n"
     echo -e "$APP_NAME_LONG installer & updater script\n"
-    echo -e "Syntax: $SCRIPT_FILE_NAME [ -i | -l | -a | -u | -b | -r | -c | -s | -S | -h ]\n"
+    echo -e "Syntax: $SCRIPT_FILE_NAME [ -i | -l | -a | -u | -b | -B | -r | -c | -s | -S | -h ]\n"
     echo -e "Options:\n"
     echo -e "\t-i\tInstall $APP_NAME_LONG from $APP_SOURCE"
     echo -e "\t-l\tCreate desktop launcher"
     echo -e "\t-a\tCreate alias for $SCRIPT_FILE_NAME"
     echo -e "\t-u\tUpdate $APP_NAME_LONG from $APP_SOURCE"
     echo -e "\t-b\tBackup $APP_NAME_LONG & configuration"
+    echo -e "\t-B\tRestore $APP_NAME_LONG & configuration from backup"
     echo -e "\t-r\tRemove $APP_NAME_LONG"
     echo -e "\t-c\tCompare local to remote version"
     echo -e "\t-s\tShow script version"
@@ -755,7 +809,7 @@ help() {
     echo -e "\t${CYN}${SCRIPT_PATH}${CRS}\t\t\tScript location\n"
 }
 
-### EXIT CLEAN
+#################### EXIT CLEAN ####################
 exit_clean() {
     if [ -d "$TMP" ] ; then
         rm -rf $TMP
@@ -764,10 +818,9 @@ exit_clean() {
     exit
 }
 
-########## MAIN ##########
+########################### MAIN ###########################
 
-## GET OPTIONS
+while getopts ":i,:l,:a,:u,:b,:B,:r,:c,:s,:S,:h" OPTION ; do
-while getopts ":i,:l,:a,:u,:b,:r,:c,:s,:S,:h" OPTION ; do
     
     if [ "$(echo $1 | wc -m)" -gt "3" ] ; then
         echo -e "\n${YEL}Option ${RED}$1${YEL} not valid! Use only one parameter at a time...${CRS}"
@@ -777,6 +830,7 @@ while getopts ":i,:l,:a,:u,:b,:r,:c,:s,:S,:h" OPTION ; do
 
     case $OPTION in
         i)
+            TARGET="INSTALL"
             echo -e "\n  ${YEL}Installing $APP_NAME_LONG...${CRS}\n"
             if [ "$#" -gt "1" ] ; then
                 ALL_PARAMETER=$@
@@ -789,6 +843,7 @@ while getopts ":i,:l,:a,:u,:b,:r,:c,:s,:S,:h" OPTION ; do
             fi
             dependency_check
             arch_check
+            path_correction
             install_application
             exit_clean ;;
 
@@ -823,6 +878,7 @@ while getopts ":i,:l,:a,:u,:b,:r,:c,:s,:S,:h" OPTION ; do
             exit_clean ;;
 
         b)
+            TARGET="BACKUP"
             echo -e "\n  ${YEL}Backing up $APP_NAME_LONG...${CRS}"
             if [ "$#" -gt "1" ] ; then
                 ALL_PARAMETER=$@
@@ -834,14 +890,42 @@ while getopts ":i,:l,:a,:u,:b,:r,:c,:s,:S,:h" OPTION ; do
                     elif [[ "$PARAMETER" == "pbzip2" || "$PARAMETER" == "gzip" || "$PARAMETER" == "bzip2" || "$PARAMETER" == "zip" ]] ; then
                         BACKUP_COMPRESSION_OVERRIDE=$PARAMETER
                     
-                    elif [ -d "$PARAMETER" ] ; then
+                    elif [[ -d "$PARAMETER" || -d "$(pwd)/$PARAMETER" ]] ; then
                         BACKUP_PATH=$PARAMETER
                     fi
                 done
             fi 
+            path_correction
             call_backup
             exit ;;
 
+        B)
+            TARGET="BACKUP"
+            echo -e "\n  ${YEL}Restoring $APP_NAME_LONG from backup...${CRS}\n"
+            if [ "$#" -gt "1" ] ; then
+                ALL_PARAMETER=$@
+
+                for PARAMETER in ${ALL_PARAMETER[@]} ; do                    
+                    if [[ "$PARAMETER" == "script" || "$PARAMETER" == "config" || "$PARAMETER" == "app" || "$PARAMETER" == "full" ]] ; then
+                        BACKUP_TYPE=$PARAMETER
+
+                    elif [[ -d $PARAMETER || -d $(pwd)/$PARAMETER ]] ; then
+                        BACKUP_PATH=$PARAMETER
+
+                    else
+                        BACKUP_TYPE=*
+                    fi
+                done
+
+            else 
+                BACKUP_TYPE=*
+
+            fi
+            dependency_check
+            path_correction
+            select_backup
+            exit_clean ;;
+
         r)
             echo -e "\n  ${YEL}Removing $APP_NAME_LONG...${CRS}\n"
             remove_application