diff --git a/.gitignore b/.gitignore index ba7230e..61a58b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -test.sh -binaries \ No newline at end of file +test.sh \ No newline at end of file diff --git a/helium_helper.sh b/helium_helper.sh index d13b25f..300a1e4 100755 --- a/helium_helper.sh +++ b/helium_helper.sh @@ -9,22 +9,19 @@ YEL="\e[0;33m" RED="\e[0;31m" GRN="\e[0;32m" LCY="\e[1;36m" -WHT="\e[1;37m" CRS="\e[0m" ## GLOBAL VARIABLES APP_NAME="Helium" APP_NAME_LONG="Helium Web Browser" +ARCH="x86_64" FILE_EXTENSION="AppImage" APP_SOURCE="GitHub" -ARCH_OVERRIDE="" -BACKUP_COMPRESSION_OVERRIDE="" SCRIPT_NAME="$APP_NAME Helper Script" SCRIPT_FILE_NAME="helium_helper.sh" AUTO_SCRIPT_FILE_NAME="helium_launcher_update.sh" SCRIPT_VERSION="0.5.8" ALIAS="update-helium" -DATE=$(date +"%d%m%y") ## LOCATIONS TMP=/tmp/$APP_NAME @@ -55,7 +52,7 @@ cmd_query() { } dependency_check () { - DEPENDENCIES=("curl" "wget" "tar") + DEPENDENCIES=("curl" "wget") mkdir -p $TMP for PACKAGE in "${DEPENDENCIES[@]}" ; do @@ -81,39 +78,22 @@ shell_query() { } shell_check() { - SHELLS=("bash" "fish" "zsh") + SHELLS=("bash" "fish" "ksh" "zsh") for SHELL_OPTION in "${SHELLS[@]}" ; do shell_query "$SHELL_OPTION" done } -### ARCH CHECK - -arch_check() { - if [ "$ARCH_OVERRIDE" ] ; then - ARCH=$ARCH_OVERRIDE - - else - ARCH=$(uname -m) - if [ "$ARCH" == "aarch64" ] ; then - ARCH="arm64" - - elif [ "$ARCH" == "amd64" ] ; then - ARCH="x86_64" - fi - fi -} - ### CHECK LOCAL INSTALL local_check() { if ! [ -d "$INSTALL_PATH" ] ; then - echo -e "\n ${YEL}$APP_NAME_LONG directory not found!${CRS}\n" + echo -e "\n ${RED}$APP_NAME_LONG directory not found!${CRS}" install_helium exit elif ! [ -f "$INSTALL_PATH/$APP_NAME.$FILE_EXTENSION" ] ; then - echo -e "\n ${YEL}$APP_NAME_LONG directory found but no executable named ${CYN}$APP_NAME.$FILE_EXTENSION${YEL}!${CRS}\n" + echo -e "\n ${RED}$APP_NAME_LONG directory found but no executable named ${CYN}$APP_NAME.$FILE_EXTENSION${RED}!${CRS}" install_helium exit fi @@ -129,12 +109,12 @@ install_helium() { while true ; do read -p " Download and install $APP_NAME_LONG from $APP_SOURCE? (Y/n) : " CONFIRM_INSTALL + echo if [[ "$CONFIRM_INSTALL" == "" || "$CONFIRM_INSTALL" == "y" || "$CONFIRM_INSTALL" == "Y" ]] ; then DOWNLOAD_URL=$(curl -s $APP_SOURCE_URL | grep "browser_download_url" | grep "$ARCH.$FILE_EXTENSION" | grep -v "zsync" | tr -d \" | awk '{print $2}') APP_SOURCE_FILENAME=$(curl -s $APP_SOURCE_URL | grep "browser_download_url" | grep "$ARCH.$FILE_EXTENSION" | grep -v "zsync" | tr -d \" | awk '{print $2}' | awk -F'/' '{print $9}') - echo -e "\n - Downloading ${CYN}$APP_SOURCE_FILENAME${CRS}..." - wget -P $TMP $DOWNLOAD_URL -q + wget -P $TMP $DOWNLOAD_URL -q --show-progress chmod +x $TMP/$APP_SOURCE_FILENAME mkdir -p $INSTALL_PATH mv $TMP/$APP_SOURCE_FILENAME $INSTALL_PATH/$APP_NAME.$FILE_EXTENSION @@ -143,11 +123,11 @@ install_helium() { break elif [[ "$CONFIRM_INSTALL" == "n" || "$CONFIRM_INSTALL" == "N" ]] ; then - echo -e "\n ${RED}Cancelled!${CRS}\n" + echo -e " ${RED}Cancelled!${CRS}" break else - echo -e "\n ${YEL}Invalid response!${CRS}\n" + echo -e " ${YEL}Invalid response!${CRS}\n" fi done @@ -162,6 +142,7 @@ add_launcher() { while true ; do echo read -p " Add $APP_NAME_LONG launcher to $LAUNCHER_PATH? (Y/n) : " CONFIRM_LAUNCHER + echo if [[ "$CONFIRM_LAUNCHER" == "" || "$CONFIRM_LAUNCHER" == "y" || "$CONFIRM_LAUNCHER" == "Y" ]] ; then LAUNCHER_URL=$REMOTE_REPO_URL/assets/launcher/helium.desktop.template @@ -170,15 +151,13 @@ add_launcher() { LOCAL_VERSION=$($INSTALL_PATH/$APP_NAME.$FILE_EXTENSION --version | awk '{print $2}') mkdir -p $LAUNCHER_PATH $SCRIPT_PATH $BACKUP_PATH $ASSET_PATH/icon if ! [ -f "$SCRIPT_PATH/$AUTO_SCRIPT_FILE_NAME" ] ; then - echo -e "\n - Downloading ${CYN}$AUTO_SCRIPT_FILE_NAME${CRS}..." - wget -P $TMP $AUTO_SCRIPT_URL -q + wget -P $TMP $AUTO_SCRIPT_URL -q --show-progress chmod +x $TMP/$AUTO_SCRIPT_FILE_NAME mv $TMP/$AUTO_SCRIPT_FILE_NAME $SCRIPT_PATH fi - echo -e "\n - Downloading ${CYN}launcher files${CRS}..." - wget -P $TMP $LAUNCHER_URL -q - wget -P $TMP $ICON_URL -q + wget -P $TMP $LAUNCHER_URL -q --show-progress + wget -P $TMP $ICON_URL -q --show-progress sed -i "s|%APP_LOCATION%|$INSTALL_PATH/$APP_NAME.$FILE_EXTENSION|" $TMP/helium.desktop.template sed -i "s|%ICON_LOCATION%|$ASSET_PATH/icon/helium.png|" $TMP/helium.desktop.template sed -i "s|%APP_VERSION%|$LOCAL_VERSION|" $TMP/helium.desktop.template @@ -218,44 +197,36 @@ add_alias() { if [ "$ACTIVE_SHELL" == "zsh" ] ; then if [ "$(cat $HOME/.zshrc | grep "$ALIAS")" ] ; then - echo -e "\n ${LCY}$ALIAS${CRS} already present in ${CYN}$HOME/.zshrc${CRS}\n" - - else - echo "### $APP_NAME_LONG Alias zsh ###" >> $HOME/.zshrc - echo "alias $ALIAS=\"$SCRIPT_PATH/$SCRIPT_FILE_NAME\"" >> $HOME/.zshrc - echo >> $HOME/.zshrc - echo -e "\n ${LCY}$ALIAS${CRS} added to ${CYN}$HOME/.zshrc${CRS}\n" + echo -e "\n ${LCY}$ALIAS ${GRN}already present in${CRS} $HOME/.zshrc\n" + exit fi + echo "alias $ALIAS=\"$SCRIPT_PATH/$SCRIPT_FILE_NAME\"" >> $HOME/.zshrc + echo -e "\n ${LCY}$ALIAS ${GRN}added to${CRS} $HOME/.zshrc\n" elif [ "$ACTIVE_SHELL" == "bash" ] ; then if [ "$(cat $HOME/.bashrc | grep "$ALIAS")" ] ; then - echo -e "\n ${LCY}$ALIAS${CRS} already present in ${CYN}$HOME/.bashrc${CRS}\n" - - else - echo "### $APP_NAME_LONG Alias bash ###" >> $HOME/.bashrc - echo "alias $ALIAS=\"$SCRIPT_PATH/$SCRIPT_FILE_NAME\"" >> $HOME/.bashrc - echo >> $HOME/.bashrc - echo -e "\n ${LCY}$ALIAS${CRS} added to ${CYN}$HOME/.bashrc${CRS}\n" + echo -e "\n ${LCY}$ALIAS ${GRN}already present in${CRS} $HOME/.bashrc\n" + exit fi + echo "alias $ALIAS=\"$SCRIPT_PATH/$SCRIPT_FILE_NAME\"" >> $HOME/.zshrc + echo -e "\n ${LCY}$ALIAS ${GRN}added to${CRS} $HOME/.bashrc\n" elif [ "$ACTIVE_SHELL" == "fish" ] ; then if [ "$(cat $HOME/.config/fish/config.fish | grep "source $HOME/.config/fish/$ALIAS.fish")" ] ; then - echo -e "\n ${LCY}$ALIAS${CRS} already present in ${CYN}$HOME/.config/fish/config.fish${CRS}\n" - - else - echo "### $APP_NAME_LONG Alias FISH ###" > $HOME/.config/fish/$ALIAS.fish - echo >> $HOME/.config/fish/$ALIAS.fish - echo "function $ALIAS" >> $HOME/.config/fish/$ALIAS.fish - echo " $SCRIPT_PATH/$SCRIPT_FILE_NAME \$argv" >> $HOME/.config/fish/$ALIAS.fish - echo "end" >> $HOME/.config/fish/$ALIAS.fish - echo >> $HOME/.config/fish/$ALIAS.fish - echo "source $HOME/.config/fish/$ALIAS.fish" >> $HOME/.config/fish/config.fish - echo -e "\n ${LCY}$ALIAS ${CRS}added to ${CYN}$HOME/.config/fish/config.fish${CRS}\n" + echo -e "\n ${LCY}$ALIAS ${GRN}already present in${CRS} $HOME/.config/fish/config.fish\n" + exit fi + echo "### Helium Helper Alias FISH ###" > $HOME/.config/fish/$ALIAS.fish + echo >> $HOME/.config/fish/$ALIAS.fish + echo "function $ALIAS" >> $HOME/.config/fish/$ALIAS.fish + echo " $SCRIPT_PATH/$SCRIPT_FILE_NAME \$argv" >> $HOME/.config/fish/$ALIAS.fish + echo "end" >> $HOME/.config/fish/$ALIAS.fish + echo "source $HOME/.config/fish/$ALIAS.fish" >> $HOME/.config/fish/config.fish + echo -e "\n ${LCY}$ALIAS ${GRN}added to${CRS} $HOME/.config/fish/config.fish\n" else - echo -e "\n ${LCY}$ACTIVE_SHELL${RED}shell is not yet supported!${CRS}\n" - echo -e " ${CRS}Working implementation are available for bash, zsh & fish!${CRS}\n" + echo -e "\n ${LCY}$ACTIVE_SHELL ${RED}not yet supported!${CRS}\n" + echo -e " ${LCY}Working implementation are available for bash, zsh & fish!${CRS}\n" fi } @@ -288,26 +259,37 @@ update_helium() { while true ; do read -p " Download and update $APP_NAME_LONG from $APP_SOURCE? (Y/n) : " CONFIRM + echo if [[ "$CONFIRM" == "" || "$CONFIRM" == "y" || "$CONFIRM" == "Y" ]] ; then DOWNLOAD_URL=$(curl -s $APP_SOURCE_URL | grep "browser_download_url" | grep "$ARCH.$FILE_EXTENSION" | grep -v "zsync" | tr -d \" | awk '{print $2}') APP_SOURCE_FILENAME=$(curl -s $APP_SOURCE_URL | grep "browser_download_url" | grep "$ARCH.$FILE_EXTENSION" | grep -v "zsync" | tr -d \" | awk '{print $2}' | awk -F'/' '{print $9}') - mkdir -p $TMP - echo -e "\n - Downloading ${CYN}$APP_SOURCE_FILENAME${CRS}..." - wget -P $TMP $DOWNLOAD_URL -q - backup_helium + mkdir -p $TMP $BACKUP_PATH + wget -P $TMP $DOWNLOAD_URL -q --show-progress chmod +x $TMP/$APP_SOURCE_FILENAME + if [ -f "$BACKUP_PATH/$APP_NAME.old" ] ; then + rm $BACKUP_PATH/$APP_NAME.old + fi + if [ -d "$APP_CONFIG_PATH" ] ; then + if [ -f "$BACKUP_PATH/$APP_NAME.config.tar" ] ; then + rm $BACKUP_PATH/$APP_NAME.config.tar + fi + tar -cf $BACKUP_PATH/$APP_NAME.config.tar $APP_CONFIG_PATH > /dev/null 2>&1 + fi + mv $INSTALL_PATH/$APP_NAME.$FILE_EXTENSION $BACKUP_PATH/$APP_NAME.old mv $TMP/$APP_SOURCE_FILENAME $INSTALL_PATH/$APP_NAME.$FILE_EXTENSION + cp $LAUNCHER_PATH/$APP_NAME.desktop $BACKUP_PATH/$APP_NAME.desktop.old + chmod -x $BACKUP_PATH/*.sh.old $BACKUP_PATH/$APP_NAME.old sed -i "s|X-AppImage-Version=.*|X-AppImage-Version=$($INSTALL_PATH/$APP_NAME.$FILE_EXTENSION --version | awk '{print $2}')|" $LAUNCHER_PATH/$APP_NAME.desktop - echo -e " ${GRN}$APP_NAME_LONG is up-to-date!${CRS}\n" + echo -e "\n ${GRN}$APP_NAME_LONG is up-to-date !${CRS}\n" break elif [[ "$CONFIRM" == "n" || "$CONFIRM" == "N" ]] ; then - echo -e "\n ${RED}Cancelled!${CRS}\n" + echo -e " ${RED}Cancelled!${CRS}\n" exit else - echo -e "\n ${YEL}Invalid response!${CRS}\n" + echo -e " ${YEL}Invalid response!${CRS}\n" fi done @@ -321,88 +303,14 @@ update_helium() { } -### BACKUP -backup_helium() { - if [[ -d "$INSTALL_PATH" || -d "$SCRIPT_PATH" || -d $APP_CONFIG_PATH ]] ; then - BACKUPABLE=("$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") - echo -e "\n - ${CRS}Collectig files for ${CYN}backup${CRS}...${CRS}" - - for BACKUP_ITEM in ${BACKUPABLE[@]} ; do - if [ -d "$BACKUP_ITEM" ] ; then - mkdir -p $TMP/backup - cp -r $BACKUP_ITEM $TMP/backup - - elif [ -f "$BACKUP_ITEM" ] ; then - mkdir -p $TMP/backup - cp $BACKUP_ITEM $TMP/backup - fi - done - - if [ -d "$TMP/backup" ] ; then - CWD=$(pwd) - cd $TMP/backup - chmod -x *.sh *.$FILE_EXTENSION > /dev/null 2>&1 - - if [ "$BACKUP_COMPRESSION_OVERRIDE" ] ; then - BACKUP_COMPRESSION=$BACKUP_COMPRESSION_OVERRIDE - - elif ! [ "$BACKUP_COMPRESSION_OVERRIDE" ] ; then - COMPRESSION_METHOD=("pbzip2" "gzip" "bzip2" "zip") - - until [ "$BACKUP_COMPRESSION" ] ; do - for COMPRESSION_TYPE in ${COMPRESSION_METHOD[@]} ; do - - if [ "$(command -v $COMPRESSION_TYPE) > /dev/null 2>&1" ] ; then - BACKUP_COMPRESSION=$COMPRESSION_TYPE - break - fi - done - done - fi - - echo -e "\n - ${CRS}Compressing backup archive with ${CYN}$BACKUP_COMPRESSION${CRS}...${CRS}\n" - - if [ "$BACKUP_COMPRESSION" == "pbzip2" ] ; then - tar -cf $APP_NAME.backup_$DATE.tar * > /dev/null 2>&1 - pbzip2 $APP_NAME.backup_$DATE.tar - mkdir -p $BACKUP_PATH - mv $APP_NAME.backup_$DATE.tar.bz2 $BACKUP_PATH - cd $TMP && rm -rf backup - - elif [ "$BACKUP_COMPRESSION" == "gzip" ] ; then - tar -cf $APP_NAME.backup_$DATE.tar * > /dev/null 2>&1 - gzip $APP_NAME.backup_$DATE.tar - mkdir -p $BACKUP_PATH - mv $APP_NAME.backup_$DATE.tar.gz $BACKUP_PATH - cd $TMP && rm -rf backup - - elif [ "$BACKUP_COMPRESSION" == "bzip2" ] ; then - tar -cf $APP_NAME.backup_$DATE.tar * > /dev/null 2>&1 - bzip2 $APP_NAME.backup_$DATE.tar - mkdir -p $BACKUP_PATH - mv $APP_NAME.backup_$DATE.tar.bz2 $BACKUP_PATH - cd $TMP && rm -rf backup - - elif [ "$BACKUP_COMPRESSION" == "zip" ] ; then - tar -cf $APP_NAME.backup_$DATE.tar * > /dev/null 2>&1 - zip -r $APP_NAME.backup_$DATE.tar.zip $APP_NAME.backup_$DATE.tar > /dev/null 2>&1 - mkdir -p $BACKUP_PATH - mv $APP_NAME.backup_$DATE.tar.zip $BACKUP_PATH - cd $TMP && rm -rf backup - - else - echo -e " ${YEL}No supported compression method detected! Copying backup uncompressed...${CRS}\n" - mkdir -p $BACKUP_PATH - mv $TMP/backup $BACKUP_PATH/$APP_NAME.backup_$DATE - cd $TMP && rm -rf backup - fi - - echo -e " - ${CRS}Backup stored in ${CYN}$BACKUP_PATH${CRS}...${CRS}\n" - cd $CWD - fi - - else - echo -e " ${YEL}Nothing to back up...${CRS}" +### AUTOMATIC UPDATE --> TO DO? +auto_update() { + if ! [ -f "$INSTALL_PATH/$APP_NAME.$FILE_EXTENSION" ] ; then + echo -e "\n ${RED}$APP_NAME AppImage not found! Can't add auto update script...${CRS}" + exit + + else + echo -e "\n ${RED}Not implemented yet...${CRS}" fi } @@ -411,14 +319,15 @@ remove_helium() { if [ -d "$INSTALL_PATH" ] ; then while true ; do - read -p " Remove $APP_NAME_LONG incl. backups, configuration and launcher? (Y/n) : " CONFIRM_REMOVE + read -p " Remove $APP_NAME_LONG incl. backups and launcher? (Y/n) : " CONFIRM_REMOVE if [[ "$CONFIRM_REMOVE" == "" || "$CONFIRM_REMOVE" == "y" || "$CONFIRM_REMOVE" == "Y" ]] ; then - REMOVABLE=("$INSTALL_PATH" "$LAUNCHER_PATH/$APP_NAME.desktop" "$SCRIPT_PATH/$SCRIPT_FILE_NAME" "$SCRIPT_PATH/$AUTO_SCRIPT_FILE_NAME" "$APP_CONFIG_PATH") - echo -e "\n - ${CRS}Removing ${CYN}$APP_NAME${CRS} directory and configuration...${CRS}" + REMOVABLE=("$INSTALL_PATH" "$LAUNCHER_PATH/$APP_NAME.desktop" "$SCRIPT_PATH/$SCRIPT_FILE_NAME" "$SCRIPT_PATH/$AUTO_SCRIPT_FILE_NAME") + echo for RM_PATH in "${REMOVABLE[@]}" ; do if [[ -f "$RM_PATH" || -d "$RM_PATH" ]] ; then + echo -e " ${YEL}Removing ${CYN}$RM_PATH ${YEL}...${CRS}" rm -rf "$RM_PATH" fi done @@ -427,28 +336,26 @@ remove_helium() { if [ "$ACTIVE_SHELL" == "zsh" ] ; then if [ "$(cat $HOME/.zshrc | grep "$ALIAS")" ] ; then - sed -i "/$APP_NAME_LONG/d" $HOME/.zshrc sed -i "/$ALIAS/d" $HOME/.zshrc - echo -e "\n - Alias removed from ${CYN}$ACTIVE_SHELL${CRS}" + echo -e "\n ${CYN}$ACTIVE_SHELL ${YEL}alias removed ... ${CRS}" fi elif [ "$ACTIVE_SHELL" == "bash" ] ; then if [ "$(cat $HOME/.bashrc | grep "$ALIAS")" ] ; then - sed -i "/$APP_NAME_LONG/d" $HOME/.bashrc sed -i "/$ALIAS/d" $HOME/.bashrc - echo -e "\n - Alias removed from ${CYN}$ACTIVE_SHELL${CRS}" + echo -e "\n ${CYN}$ACTIVE_SHELL ${YEL}alias removed ... ${CRS}" fi elif [ "$ACTIVE_SHELL" == "fish" ] ; then if [ "$(cat $HOME/.config/fish/config.fish | grep "source $HOME/.config/fish/$ALIAS.fish")" ] ; then sed -i "/$ALIAS/d" $HOME/.config/fish/config.fish rm $HOME/.config/fish/$ALIAS.fish - echo -e "\n - Alias removed from ${CYN}$ACTIVE_SHELL${CRS}" + echo -e "\n ${CYN}$ACTIVE_SHELL ${YEL}alias removed ... ${CRS}" fi fi - echo -e "\n ${YEL}$APP_NAME_LONG removed!${CRS}\n" - break + echo -e "\n ${RED}$APP_NAME_LONG removed!${CRS}\n" + exit elif [[ "$CONFIRM_REMOVE" == "n" || "$CONFIRM_REMOVE" == "N" ]] ; then echo -e " ${RED}Cancelled!${CRS}" @@ -460,14 +367,16 @@ remove_helium() { done else - echo -e " ${RED}Can't remove $APP_NAME_LONG! ${CYN}$INSTALL_PATH ${RED}directory not found...${CRS}\n" + echo -e "\n ${RED}Can't remove $APP_NAME_LONG! ${YEL}$INSTALL_PATH ${RED}directory not found...${CRS}" exit fi } ### SCRIPT VERSION script_version() { - echo -e "\n ${CYN}$APP_NAME_LONG Helper Script Version : ${CRS}$SCRIPT_VERSION\n" + echo -e "\n ${CYN}$APP_NAME_LONG Helper Script Version :${CRS} $SCRIPT_VERSION\n" + exit + } ### UPDATE SCRIPT @@ -481,14 +390,15 @@ 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 + if ! [ -d "$SCRIPT_PATH" ] ; then + mkdir -p $SCRIPT_PATH + fi 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 - mv $TMP/$SCRIPT_FILE_NAME $TMP/$AUTO_SCRIPT_FILE_NAME $SCRIPT_PATH + chmod +x $TMP/$SCRIPT_FILE_NAME + mv $TMP/$SCRIPT_FILE_NAME $SCRIPT_PATH echo -e "\n ${GRN}$SCRIPT_FILE_NAME is up-to-date!${CRS}" - break + exit_clean elif [[ "$CONFIRM_SCRIPT_INSTALL" == "n" || "$CONFIRM_SCRIPT_INSTALL" == "N" ]] ; then echo -e " ${RED}Cancelled!${CRS}\n" @@ -533,11 +443,10 @@ update_script() { mkdir -p $BACKUP_PATH fi mv $SCRIPT_PATH/$SCRIPT_FILE_NAME $BACKUP_PATH/$SCRIPT_FILE_NAME.old - mv $SCRIPT_PATH/$AUTO_SCRIPT_FILE_NAME $BACKUP_PATH/$AUTO_SCRIPT_FILE_NAME.old + 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 - mv $TMP/$SCRIPT_FILE_NAME $TMP/$AUTO_SCRIPT_FILE_NAME $SCRIPT_PATH + chmod +x $TMP/$SCRIPT_FILE_NAME + mv $TMP/$SCRIPT_FILE_NAME $SCRIPT_PATH echo -e " ${GRN}$SCRIPT_FILE_NAME is up-to-date!${CRS}" break @@ -558,7 +467,7 @@ update_script() { fi } -### COMPARE APPIMAGE VERSIONarch_check +### COMPARE APPIMAGE VERSION compare_version() { 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}') @@ -581,17 +490,19 @@ compare_version() { echo -e "\n ${GRN}$APP_NAME_LONG is up-to-date!${CRS}\n" echo -e " ${CYN}Local Version :\t${CRS}${LOCAL_VERSION}" echo -e " ${CYN}$APP_SOURCE Version :\t${CRS}${APP_SOURCE_VERSION}\n" + exit elif [ "$APP_SOURCE_VERSION_NUM" -gt "$LOCAL_VERSION_NUM" ] ; then echo -e "\n ${YEL}$APP_NAME_LONG is updatable!${CRS}\n" echo -e " ${CYN}Local Version :\t${CRS}${LOCAL_VERSION}" echo -e " ${CYN}$APP_SOURCE Version :\t${CRS}${APP_SOURCE_VERSION}\n" + exit else echo -e "\n ${RED}Version tags malformed or you are using a Beta version!${CRS}\n" echo -e " ${CYN}Local Version :\t${CRS}${LOCAL_VERSION}" echo -e " ${CYN}$APP_SOURCE Version :\t${CRS}${APP_SOURCE_VERSION}\n" - echo -e " ${RED}Update failed... Exiting...${CRS}\n" + echo -e " ${RED}Update failed ... Exiting ...${CRS}\n" exit fi } @@ -606,7 +517,7 @@ help() { echo -e "\t-l\tCreate desktop launcher" echo -e "\t-a\tCreate alias for $SCRIPT_FILE_NAME" echo -e "\t-u\tDownload & update $APP_NAME_LONG from $APP_SOURCE" - echo -e "\t-b\tBackup $APP_NAME_LONG & configuration" + #echo -e "\t-U\tEnable automatic updates on login ${RED}--> Not yet working${CRS}" echo -e "\t-r\tRemove $APP_NAME_LONG" echo -e "\t-c\tCompare local to remote version" echo -e "\t-s\tShow script version" @@ -630,54 +541,48 @@ exit_clean() { ########## MAIN ########## ## GET OPTIONS -while getopts ":i,:l,:a,:u,:b,:r,:c,:s,:S,:h" OPTION ; do +while getopts ":i,:l,:a,:u,:U,:r,:c,:s,:S,:h" OPTION ; do case $OPTION in i) - echo -e "\n ${YEL}Installing $APP_NAME_LONG...${CRS}\n" + echo -e "\n ${CYN}Installing $APP_NAME_LONG...${CRS}" dependency_check - arch_check install_helium exit_clean ;; l) - echo -e "\n ${YEL}Adding $APP_NAME_LONG launcher...${CRS}" + echo -e "\n ${CYN}Adding $APP_NAME_LONG launcher...${CRS}" dependency_check local_check add_launcher exit_clean ;; a) - echo -e "\n ${YEL}Adding alias...${CRS}" - if [ "$2" ] ; then - ALIAS=$2 - fi + echo -e "\n ${CYN}Adding alias...${CRS}" shell_check add_alias exit ;; u) - echo -e "\n ${YEL}Updating $APP_NAME_LONG...${CRS}" + echo -e "\n ${CYN}Updating $APP_NAME_LONG...${CRS}" dependency_check - arch_check local_check update_helium exit_clean ;; - b) - echo -e "\n ${YEL}Backing up $APP_NAME_LONG incl. configuration and script...${CRS}" - if [ "$2" ] ; then - BACKUP_PATH=$2 - fi - backup_helium - exit ;; + U) + echo -e "\n ${CYN}Enabling automatic updates...${CRS}" + dependency_check + local_check + auto_update + exit_clean ;; r) - echo -e "\n ${YEL}Removing $APP_NAME_LONG...${CRS}\n" + echo -e "\n ${CYN}Removing $APP_NAME_LONG...${CRS}" remove_helium exit ;; c) - echo -e "\n ${YEL}Comparing remote to local version...${CRS}" + echo -e "\n ${CYN}Comparing remote to local version...${CRS}" dependency_check local_check compare_version @@ -688,7 +593,7 @@ while getopts ":i,:l,:a,:u,:b,:r,:c,:s,:S,:h" OPTION ; do exit ;; S) - echo -e "\n ${YEL}Updating script...${CRS}" + echo -e "\n ${CYN}Updating script...${CRS}" dependency_check update_script exit_clean ;; @@ -706,7 +611,6 @@ done ## DEPENDENCY CHECK dependency_check -arch_check ## CHECK FOR LOCAL INSTALL local_check diff --git a/helium_launcher_update.sh b/helium_launcher_update.sh index 8123131..2b9f81c 100755 --- a/helium_launcher_update.sh +++ b/helium_launcher_update.sh @@ -10,7 +10,6 @@ ARCH="x86_64" FILE_EXTENSION="AppImage" APP_SOURCE="GitHub" SCRIPT_NAME="$APP_NAME Launcher Updater" -PARENT_SCRIPT_FILE_NAME="helium_helper.sh" SCRIPT_FILE_NAME="helium_launcher_update.sh" SCRIPT_VERSION="0.5.8" DATE=$(date) @@ -121,9 +120,8 @@ update_script() { mv $SCRIPT_PATH/$SCRIPT_FILE_NAME $BACKUP_PATH/$SCRIPT_FILE_NAME.old mkdir -p $TMP wget -P $TMP $REMOTE_SCRIPT_URL -q - wget -P $TMP $REMOTE_REPO_URL/$PARENT_SCRIPT_FILE_NAME -q - chmod +x $TMP/$SCRIPT_FILE_NAME $TMP/$PARENT_SCRIPT_FILE_NAME - mv $TMP/$SCRIPT_FILE_NAME $TMP/$PARENT_SCRIPT_FILE_NAME $SCRIPT_PATH + chmod +x $TMP/$SCRIPT_FILE_NAME + mv $TMP/$SCRIPT_FILE_NAME $SCRIPT_PATH echo "$DATE | Script updated to version $REMOTE_SCRIPT_VERSION" >> $LOG notify-send --icon="$ICON" --app-name="Helium Helper" "Script updated to version $REMOTE_SCRIPT_VERSION"