diff --git a/helium_helper.sh b/helium_helper.sh index 82550b5..606790a 100755 --- a/helium_helper.sh +++ b/helium_helper.sh @@ -19,8 +19,8 @@ APP_NAME_LONG="Helium Web Browser" SOURCE="GitHub" SCRIPT_NAME="$APP_NAME Helper Script" SCRIPT_FILE_NAME="helium_helper.sh" -SCRIPT_VERSION="0.5.2" -DATE=$(date) +SCRIPT_VERSION="0.5.3" +ALIAS="update-helium" ## LOCATIONS TMP=/tmp/$APP_NAME @@ -158,6 +158,18 @@ add_launcher() { fi } +### ALIAS +add_alias() { + if [ -f "$HOME/.zshrc" ] ; then + echo "alias $ALIAS=\"$SCRIPT_PATH/$SCRIPT_FILE_NAME\"" >>$HOME/.zshrc + echo -e "\n ${GRN}$ALIAS added to${CRS} $HOME/.zshrc" + + else + echo -e "\n ${RED}No .bashrc like file found!${CRS}" + + fi +} + ### UPDATE update_helium() { LOCAL_VERSION=$($INSTALL_PATH/$APP_NAME.AppImage --version | awk '{print $2}') @@ -245,26 +257,26 @@ remove_helium() { if [ -d "$INSTALL_PATH" ] ; then while true ; do - read -p " Remove $APP_NAME_LONG incl. backups 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 - rm -rf $INSTALL_PATH - if [ -f "$LAUNCHER_PATH/$APP_NAME.desktop" ] ; then - rm $LAUNCHER_PATH/$APP_NAME.desktop + if [[ "$CONFIRM_REMOVE" == "" || "$CONFIRM_REMOVE" == "y" || "$CONFIRM_REMOVE" == "Y" ]] ; then + rm -rf $INSTALL_PATH + if [ -f "$LAUNCHER_PATH/$APP_NAME.desktop" ] ; then + rm $LAUNCHER_PATH/$APP_NAME.desktop + fi + echo -e "\n ${RED}$APP_NAME_LONG removed!${CRS}" + exit + + elif [[ "$CONFIRM_REMOVE" == "n" || "$CONFIRM_REMOVE" == "N" ]] ; then + echo -e " ${RED}Cancelled!${CRS}" + exit + + else + echo -e " ${YEL}Invalid response!${CRS}\n" + fi - echo -e "\n ${RED}$APP_NAME_LONG removed!${CRS}" - exit - elif [[ "$CONFIRM_REMOVE" == "n" || "$CONFIRM_REMOVE" == "N" ]] ; then - echo -e " ${RED}Cancelled!${CRS}" - exit - - else - echo -e " ${YEL}Invalid response!${CRS}\n" - - fi - - done + done else echo -e "\n ${RED}Can't remove $APP_NAME_LONG! ${YEL}$INSTALL_PATH ${RED}directory not found...${CRS}" @@ -292,8 +304,31 @@ update_script() { ### CHECK FOR LOCAL SCRIPT if ! [ -f "$SCRIPT_PATH/$SCRIPT_FILE_NAME" ] ; then - echo -e "\n ${RED}$SCRIPT_FILE_NAME not found! Can't update script...${CRS}" - exit + echo -e "\n ${YEL}$SCRIPT_FILE_NAME not found...${CRS}" + + while true ; do + echo + 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 + if ! [ -d "$SCRIPT_PATH" ] ; then + mkdir -p $SCRIPT_PATH + fi + + mv $TMP/$SCRIPT_FILE_NAME $SCRIPT_PATH + echo -e "\n ${GRN}$SCRIPT_FILE_NAME is up-to-date!${CRS}" + exit_clean + + elif [[ "$CONFIRM_SCRIPT_INSTALL" == "n" || "$CONFIRM_SCRIPT_INSTALL" == "N" ]] ; then + echo -e " ${RED}Cancelled!${CRS}" + exit + + else + echo -e " ${YEL}Invalid response!${CRS}\n" + + fi + + done fi @@ -398,11 +433,11 @@ compare_version() { 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 | -u | -r | -c | -s | -h ]\n" # | -U | -S | -a | + echo -e "Syntax: $SCRIPT_FILE_NAME [ -i | -l | -a | -u | -r | -c | -s | -S | -h ]\n" # | -U | echo -e "Options:\n" echo -e "\t-i\tDownload & install $APP_NAME_LONG from $SOURCE" echo -e "\t-l\tCreate desktop launcher" - echo -e "\t-a\tCreate alias for $SCRIPT_FILE_NAME ${RED}--> Not yet working${CRS}" + echo -e "\t-a\tCreate alias for $SCRIPT_FILE_NAME ${YEL}--> Working with zsh${CRS}" echo -e "\t-u\tDownload & update $APP_NAME_LONG from $SOURCE" echo -e "\t-U\tEnable automatic updates on login ${RED}--> Not yet working${CRS}" echo -e "\t-r\tRemove $APP_NAME_LONG" @@ -432,39 +467,44 @@ exit_clean() { 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}" + echo -e "\n ${CYN}Installing $APP_NAME_LONG...${CRS}" dependency_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 ${CYN}Adding alias...${CRS}" + add_alias + exit ;; + u) - echo -e "\n ${YEL}Updating $APP_NAME_LONG...${CRS}" + echo -e "\n ${CYN}Updating $APP_NAME_LONG...${CRS}" dependency_check local_check update_helium exit_clean ;; U) - echo -e "\n ${YEL}Enabling automatic updates...${CRS}" + 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}" + 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 @@ -475,7 +515,7 @@ while getopts ":i,:l,:a,:u,:U,: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 ;;