diff --git a/helium_helper.sh b/helium_helper.sh index aaaedc1..52dad3e 100755 --- a/helium_helper.sh +++ b/helium_helper.sh @@ -24,14 +24,13 @@ SCRIPT_NAME="$APP_NAME Helper Script" SCRIPT_FILE_NAME="helium_helper.sh" AUTO_SCRIPT_FILE_NAME="helium_launcher_update.sh" SCRIPT_VERSION="0.5.9.1" -ALIAS="helium-helper" +ALIAS="update-helium" DATE=$(date +"%d%m%y") ## LOCATIONS TMP=/tmp/$APP_NAME -INSTALL_PATH=$HOME/.apps/$APP_NAME\1 -APP_CONFIG_FOLDER="net.imput.helium" -APP_CONFIG_PATH=$HOME/.config/$APP_CONFIG_FOLDER +INSTALL_PATH=$HOME/.apps/$APP_NAME +APP_CONFIG_PATH=$HOME/.config/net.imput.helium ASSET_PATH=$INSTALL_PATH/assets BACKUP_PATH=$ASSET_PATH/backup LOG_PATH=$ASSET_PATH/logs @@ -45,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 ########### -#################### DEPENDENCY CHECK #################### +### DEPENDENCIES cmd_query() { if ! command -v $PACKAGE > /dev/null 2>&1 ; then echo " - $PACKAGE" >> $TMP/missingDeps @@ -69,7 +68,7 @@ dependency_check () { fi } -#################### SHELL CHECK #################### +### SHELL CHECK shell_query() { if [ "$(echo $SHELL | grep "$SHELL_OPTION")" ] ; then ACTIVE_SHELL=$SHELL_OPTION @@ -85,7 +84,7 @@ shell_check() { done } -#################### ARCH CHECK #################### +### ARCH CHECK arch_check() { if [ "$ARCH_OVERRIDE" ] ; then ARCH=$ARCH_OVERRIDE @@ -106,7 +105,7 @@ arch_check() { fi } -#################### LOCAL INSTALL CHECK #################### +### CHECK LOCAL INSTALL local_check() { if ! [ -d "$INSTALL_PATH" ] ; then echo -e "\n ${YEL}$APP_NAME_LONG directory not found!${CRS}\n" @@ -120,33 +119,7 @@ local_check() { fi } -#################### 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 install_application() { if [ -f "$INSTALL_PATH/$APP_NAME.$FILE_EXTENSION" ] ; then echo -e " ${YEL}$APP_NAME_LONG AppImage found! Trying to update...${CRS}" @@ -179,7 +152,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}" @@ -232,7 +205,7 @@ add_launcher() { fi } -#################### ALIAS #################### +### ALIAS add_alias() { if ! [ -f "$SCRIPT_PATH/$SCRIPT_FILE_NAME" ] ; then mkdir -p $SCRIPT_PATH @@ -284,7 +257,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}') @@ -343,10 +316,9 @@ update_application() { fi } -#################### BACKUP #################### +### BACKUP call_backup() { - BACKUP_COUNT=$(ls $BACKUP_PATH/$APP_NAME.$BACKUP_METHOD.backup_* 2> /dev/null | wc -l) - if [[ "$BACKUP_COUNT" -gt "0" ]] ; then + if [ $(ls $BACKUP_PATH\/$APP_NAME\.$BACKUP_METHOD\.backup_* | wc -l) -gt "1" ] ; then echo -e "\n ${CYN}A $BACKUP_METHOD backup already exists!${CRS}\n" while true ; do @@ -378,50 +350,40 @@ backup_logger() { if [ "$ACTIVE_SHELL" == "zsh" ] ; then if [ "$(cat $HOME/.zshrc | grep "$ALIAS")" ] ; then - echo " # Shell : $ACTIVE_SHELL" >> $TMP/backup/conf_log - echo " # Alias : TRUE" >> $TMP/backup/conf_log + echo " - Shell : $ACTIVE_SHELL" >> $TMP/backup/conf_log + echo " - Alias : TRUE" >> $TMP/backup/conf_log fi elif [ "$ACTIVE_SHELL" == "bash" ] ; then if [ "$(cat $HOME/.bashrc | grep "$ALIAS")" ] ; then - echo " # Shell : $ACTIVE_SHELL" >> $TMP/backup/conf_log - echo " # Alias : TRUE" >> $TMP/backup/conf_log + echo " - Shell : $ACTIVE_SHELL" >> $TMP/backup/conf_log + echo " - Alias : TRUE" >> $TMP/backup/conf_log fi elif [ "$ACTIVE_SHELL" == "fish" ] ; then if [ "$(cat $HOME/.config/fish/config.fish | grep "source $HOME/.config/fish/$ALIAS.fish")" ] ; then - echo " # Shell : $ACTIVE_SHELL" >> $TMP/backup/conf_log - echo " # Alias : TRUE" >> $TMP/backup/conf_log + echo " - Shell : $ACTIVE_SHELL" >> $TMP/backup/conf_log + echo " - Alias : TRUE" >> $TMP/backup/conf_log fi else - echo " # Shell : $ACTIVE_SHELL" >> $TMP/backup/conf_log - echo " # Alias : FALSE" >> $TMP/backup/conf_log + echo " - Shell : $ACTIVE_SHELL" >> $TMP/backup/conf_log + echo " - Alias : FALSE" >> $TMP/backup/conf_log fi LOGGABLE=("$INSTALL_PATH/$APP_NAME.$FILE_EXTENSION" "$SCRIPT_PATH/$SCRIPT_FILE_NAME" "$SCRIPT_PATH/$AUTO_SCRIPT_FILE_NAME" "$LAUNCHER_PATH/$APP_NAME.desktop" "$APP_CONFIG_PATH") for LOG_ITEM in ${LOGGABLE[@]} ; do if [ -d "$LOG_ITEM" ] ; then - echo " # Folder : $LOG_ITEM" >> $TMP/backup/conf_log + echo " - Directory : $LOG_ITEM" >> $TMP/backup/conf_log elif [ -f "$LOG_ITEM" ] ; then - echo " # File : $LOG_ITEM" >> $TMP/backup/conf_log + echo " - File : $LOG_ITEM" >> $TMP/backup/conf_log else - echo " # N/A : $LOG_ITEM" >> $TMP/backup/conf_log + echo " - N/A : $LOG_ITEM" >> $TMP/backup/conf_log fi done - - echo >> $TMP/backup/conf_log - echo >> $TMP/backup/conf_log - echo "### $SCRIPT_FILE_NAME VARIABLES ###" >> $TMP/backup/conf_log - echo >> $TMP/backup/conf_log - echo "INSTALL_PATH=$INSTALL_PATH" >> $TMP/backup/conf_log - echo "SCRIPT_PATH=$SCRIPT_PATH" >> $TMP/backup/conf_log - echo "LAUNCHER_PATH=$LAUNCHER_PATH" >> $TMP/backup/conf_log - echo "APP_CONFIG_PATH=$APP_CONFIG_PATH" >> $TMP/backup/conf_log - echo >> $TMP/backup/conf_log } backup_file_collector() { @@ -559,170 +521,28 @@ pack_backup() { fi } -#################### RESTORE BACKUP #################### -select_backup() { - BACKUP_COUNT=$(ls $BACKUP_PATH/$APP_NAME.$BACKUP_TYPE.backup_* 2> /dev/null | wc -l) - if [ "$BACKUP_COUNT" -gt "1" ] ; then - i=1 +### RESTORE BACKUP +restore_backup() { + if [ $(ls $BACKUP_PATH\/$APP_NAME\.*.backup_* | wc -l) -gt "1" ] ; then + NUMBER=1 mkdir -p $TMP/backup_restore CWD=$(pwd) cd $BACKUP_PATH - RESTORE_OPTIONS=$(ls -lt $APP_NAME\.$BACKUP_TYPE\.backup_* | awk '{print $9}') + RESTORE_OPTIONS=$(ls -lt $APP_NAME\.*.backup_* | awk '{print $9}') for RESTORE_TARGET in ${RESTORE_OPTIONS[@]} ; do - echo " $i - $RESTORE_TARGET" >> $TMP/backup_restore/options - i=$(($i+1)) + echo "$NUMBER - $RESTORE_TARGET" >> $TMP/backup_restore/options + NUMBER=$(($NUMBER+1)) done cd $CWD - echo -e "\n ${CYN}Choose one of the $BACKUP_COUNT options below${CRS}\n" - echo -e "$(cat $TMP/backup_restore/options)\n" - - 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}') - BACKUP_TYPE=$(echo $RESTORE_FILE | awk -F'.' '{print $2}') - RESTORE_SOURCE=$BACKUP_PATH/$RESTORE_FILE - 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}\n" - exit_clean - - else - RESTORE_SOURCE=$(ls $BACKUP_PATH/$APP_NAME.$BACKUP_TYPE.backup_*) - RESTORE_FILE=$(echo $RESTORE_SOURCE | rev | awk -F'/' '{print $1}' | rev) - - if [ "$BACKUP_TYPE" == "*" ] ; then - BACKUP_TYPE=$(file $RESTORE_SOURCE | awk '{print $1}' | awk -F'.' '{print $2}') - fi + echo -e "$(cat $TMP/backup_restore/options)" + rm -rf $TMP fi - BACKUP_COMPRESSION=$(file $RESTORE_SOURCE | awk '{print $2}') - decompress_backup - configure_restore - restore_backup } -decompress_backup() { - CWD=$(pwd) - mkdir -p $TMP/backup_restore - cd $TMP/backup_restore - echo -e "\n - ${CRS}Decompressing backup archive ${CYN}$RESTORE_FILE${CRS}...${CRS}\n" - cp $RESTORE_SOURCE . - - if [ "$BACKUP_COMPRESSION" == "bzip2" ] ; then - tar -xjf $APP_NAME.*.backup_*.tar.bz2 - rm $APP_NAME.*.backup_*.tar.bz2 - - elif [ "$BACKUP_COMPRESSION" == "gzip" ] ; then - tar -xzf $APP_NAME.*.backup_*.tar.gz - rm $APP_NAME.*.backup_*.tar.gz - - elif [ "$BACKUP_COMPRESSION" == "zip" ] ; then - unzip $APP_NAME.*.backup_*.tar.zip - tar -xf $APP_NAME.*.backup_*.tar - rm $APP_NAME.*.backup_*.tar.zip $APP_NAME.*.backup_*.tar.zip - - else - echo -e " ${YEL}TBA...${CRS}\n" ####################################################################### - fi -} - -configure_restore() { - echo -e " - ${CRS}Analysing ${CYN}$BACKUP_TYPE${CRS} backup content...${CRS}\n" - - RESTORABLE=("$APP_NAME.$FILE_EXTENSION" "$SCRIPT_FILE_NAME" "$AUTO_SCRIPT_FILE_NAME" "$APP_NAME.desktop" "$APP_CONFIG_FOLDER") - - for RESTORE_ITEM in ${RESTORABLE[@]} ; do - if [ -d "$RESTORE_ITEM" ] ; then - if [ -d "$APP_CONFIG_PATH" ] ; then - echo " - Folder : $RESTORE_ITEM | already present" >> $TMP/restore_conf - echo $RESTORE_ITEM >> $TMP/restore_check - - else - echo " - Folder : $RESTORE_ITEM | not present" >> $TMP/restore_conf - fi - - elif [ -f "$RESTORE_ITEM" ] ; then - if [[ -f "$INSTALL_PATH/$RESTORE_ITEM" || -f "$SCRIPT_PATH/$RESTORE_ITEM" || -f "$LAUNCHER_PATH/$RESTORE_ITEM" ]] ; then - echo " - File : $RESTORE_ITEM | already present" >> $TMP/restore_conf - echo "\"$RESTORE_ITEM\"" >> $TMP/restore_check - - else - echo " - File : $RESTORE_ITEM | not present" >> $TMP/restore_conf - fi - fi - done - - RESTORE_PATH=("INSTALL_PATH" "SCRIPT_PATH" "LAUNCHER_PATH" "APP_CONFIG_PATH") - ################################################################################################# - for CHANGED in ${RESTORE_PATH[@]} ; do - LOCAL_PATH=$(echo \$$CHANGED) - echo $LOCAL_PATH - if [ "$(cat conf_log | grep $RESTORE_PATH | awk -F '=' '{print $2}')" == "$LOCAL_PATH" ] ; then - echo $(cat conf_log | grep "${CHANGED}_PATH") >> $TMP/restore_path_change - echo "${CHANGED}_PATH" - - else - echo "BAD" - echo $(cat conf_log | grep "${CHANGED}_PATH") - fi - done -} - -restore_backup() { - echo -e " ${LCY}Backup Content Summary${CRS}\n" - echo -e "$(cat $TMP/restore_conf)\n" - - if [ -f "$TMP/restore_check" ] ; then - echo -e " ${RED}WARNING: Some items are existing on your system!${CRS}\n" - - while true ; do - read -p " Overwrite existing? (y/N) : " RESTORE_OVERWRITE - - if [[ "$RESTORE_OVERWRITE" == "" || "$RESTORE_OVERWRITE" == "n" || "$RESTORE_OVERWRITE" == "N" ]] ; then - echo -e "\n ${RED}Cancelled!${CRS}\n" - break - - elif [[ "$RESTORE_OVERWRITE" == "y" || "$RESTORE_OVERWRITE" == "Y" ]] ; then - EXISTING=$(cat $TMP/restore_check) - - for REPLACE in ${EXISTING[@]} ; do - rm -rf $REPLACE - done - fi - done - - else - echo -e " ${CYN}The content above is about to be restored...${CRS}\n" - - while true ; do - read -p " Proceed with changes? (Y/n) : " RESTORE_CONFIRM - - if [[ "$RESTORE_CONFIRM" == "" || "$RESTORE_CONFIRM" == "y" || "$RESTORE_CONFIRM" == "Y" ]] ; then - echo -e " - ${CRS}Copying ${CYN}$BACKUP_TYPE${CRS} backup files...${CRS}\n" - - elif [[ "$RESTORE_CONFIRM" == "n" || "$RESTORE_CONFIRM" == "N" ]] ; then - echo -e "\n ${RED}Cancelled!${CRS}\n" - break - fi - done - fi -} - -#################### REMOVE #################### +### REMOVE remove_application() { if [ -d "$INSTALL_PATH" ] ; then @@ -767,11 +587,11 @@ remove_application() { break elif [[ "$CONFIRM_REMOVE" == "n" || "$CONFIRM_REMOVE" == "N" ]] ; then - echo -e "\n ${RED}Cancelled!${CRS}" + echo -e " ${RED}Cancelled!${CRS}" exit else - echo -e "\n ${YEL}Invalid response!${CRS}\n" + echo -e " ${YEL}Invalid response!${CRS}\n" fi done @@ -781,12 +601,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" @@ -802,7 +622,8 @@ update_script() { read -p " Copy script to $SCRIPT_PATH? (Y/n) : " CONFIRM_SCRIPT_INSTALL if [[ "$CONFIRM_SCRIPT_INSTALL" == "" || "$CONFIRM_SCRIPT_INSTALL" == "y" || "$CONFIRM_SCRIPT_INSTALL" == "Y" ]] ; then - mkdir -p $SCRIPT_PATH $TMP + mkdir -p $SCRIPT_PATH + mkdir -p $TMP wget -P $TMP $REMOTE_SCRIPT_URL -q wget -P $TMP $REMOTE_REPO_URL/$AUTO_SCRIPT_FILE_NAME -q chmod +x $TMP/$SCRIPT_FILE_NAME $TMP/$AUTO_SCRIPT_FILE_NAME @@ -845,6 +666,7 @@ update_script() { while true ; do read -p " Update $SCRIPT_FILE_NAME? (Y/n) : " CONFIRM_SCRIPT_UPDATE + echo if [[ "$CONFIRM_SCRIPT_UPDATE" == "" || "$CONFIRM_SCRIPT_UPDATE" == "y" || "$CONFIRM_SCRIPT_UPDATE" == "Y" ]] ; then if ! [ -d "$BACKUP_PATH" ] ; then @@ -860,11 +682,11 @@ update_script() { break elif [[ "$CONFIRM_SCRIPT_UPDATE" == "n" || "$CONFIRM_SCRIPT_UPDATE" == "N" ]] ; then - echo -e "\n ${RED}Cancelled!${CRS}\n" + echo -e " ${RED}Cancelled!${CRS}\n" break else - echo -e "\n ${YEL}Invalid response!${CRS}\n" + echo -e " ${YEL}Invalid response!${CRS}\n" fi done @@ -875,7 +697,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" @@ -911,18 +733,17 @@ 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 | -B | -r | -c | -s | -S | -h ]\n" + echo -e "Syntax: $SCRIPT_FILE_NAME [ -i | -l | -a | -u | -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" @@ -934,7 +755,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 @@ -943,9 +764,10 @@ exit_clean() { exit } -########################### MAIN ########################### +########## MAIN ########## -while getopts ":i,:l,:a,:u,:b,:B,:r,:c,:s,:S,:h" OPTION ; do +## GET OPTIONS +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}" @@ -955,7 +777,6 @@ while getopts ":i,:l,:a,:u,:b,: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=$@ @@ -968,7 +789,6 @@ while getopts ":i,:l,:a,:u,:b,:B,:r,:c,:s,:S,:h" OPTION ; do fi dependency_check arch_check - path_correction install_application exit_clean ;; @@ -1003,7 +823,6 @@ while getopts ":i,:l,:a,:u,:b,: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=$@ @@ -1015,41 +834,13 @@ while getopts ":i,:l,:a,:u,:b,: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" || -d "$(pwd)/$PARAMETER" ]] ; then + elif [ -d "$PARAMETER" ] ; then BACKUP_PATH=$PARAMETER fi done fi - path_correction call_backup - exit_clean ;; - - B) - TARGET="BACKUP" - echo -e "\n ${YEL}Restoring $APP_NAME_LONG from backup...${CRS}" - 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 ;; + exit ;; r) echo -e "\n ${YEL}Removing $APP_NAME_LONG...${CRS}\n"