diff --git a/helium_helper.sh b/helium_helper.sh index 2f892e5..e9ff09d 100755 --- a/helium_helper.sh +++ b/helium_helper.sh @@ -20,7 +20,7 @@ SOURCE="GitHub" SCRIPT_NAME="$APP_NAME Helper Script" SCRIPT_FILE_NAME="helium_helper.sh" AUTO_SCRIPT_FILE_NAME="helium_auto_update.sh" -SCRIPT_VERSION="0.5.5" +SCRIPT_VERSION="0.5.6" ALIAS="update-helium" ## LOCATIONS @@ -332,16 +332,7 @@ script_version() { } ### UPDATE SCRIPT -remote_script_check() { - REMOTE_SCRIPT_URL=https://lab.c95.org/fr4nz/helium-helper/raw/branch/main/$SCRIPT_FILE_NAME - mkdir -p $TMP - wget -P $TMP $REMOTE_SCRIPT_URL -q - chmod +x $TMP/$SCRIPT_FILE_NAME -} - update_script() { - remote_script_check - ### CHECK FOR LOCAL SCRIPT if ! [ -f "$SCRIPT_PATH/$SCRIPT_FILE_NAME" ] ; then echo -e "\n ${YEL}$SCRIPT_FILE_NAME not found...${CRS}" @@ -354,7 +345,9 @@ update_script() { if ! [ -d "$SCRIPT_PATH" ] ; then mkdir -p $SCRIPT_PATH fi - + mkdir -p $TMP + wget -P $TMP $REMOTE_SCRIPT_URL -q + 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}" exit_clean @@ -372,7 +365,7 @@ update_script() { fi - REMOTE_SCRIPT_VERSION=$($TMP/$SCRIPT_FILE_NAME -s | awk '{print $8}' | tr -d '\n' ) + REMOTE_SCRIPT_VERSION=$(curl -s https://lab.c95.org/fr4nz/helium-helper/raw/branch/main/$SCRIPT_FILE_NAME | grep -m 1 "SCRIPT_VERSION" | tr -d 'SCRIPT_VERSION="') ### CHECK FOR EMPTY VERSION TAGS if [ -z "$SCRIPT_VERSION" ] ; then @@ -406,6 +399,9 @@ update_script() { mkdir -p $BACKUP_PATH fi mv $SCRIPT_PATH/$SCRIPT_FILE_NAME $BACKUP_PATH/$SCRIPT_FILE_NAME.old + mkdir -p $TMP + wget -P $TMP $REMOTE_SCRIPT_URL -q + 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 @@ -480,7 +476,7 @@ help() { 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 ${YEL}--> Partially working with zsh & bash${CRS}" + echo -e "\t-a\tCreate alias for $SCRIPT_FILE_NAME ${YEL}--> Working with zsh & bash${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"