From 9586095f86b1bcb32cae1fc12c1d0c119232d591 Mon Sep 17 00:00:00 2001 From: Fr4nz D13trich Date: Sat, 27 Dec 2025 11:53:59 +0100 Subject: [PATCH] Log View added; Removal extended --- helium_auto_update.sh | 21 ++++++++++++++++----- helium_helper.sh | 12 ++++++++++-- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/helium_auto_update.sh b/helium_auto_update.sh index 11a2ebc..a7d8ecf 100755 --- a/helium_auto_update.sh +++ b/helium_auto_update.sh @@ -11,7 +11,7 @@ APP_NAME_LONG="Helium Web Browser" SOURCE="GitHub" SCRIPT_NAME="$APP_NAME quiet updater" SCRIPT_FILE_NAME="helium_auto_update.sh" -SCRIPT_VERSION="0.5.6" +SCRIPT_VERSION="0.5.5" ALIAS="auto-update-helium" ## LOCATIONS @@ -76,7 +76,7 @@ dependency_check () { ### UPDATE SCRIPT update_script() { REMOTE_SCRIPT_URL=https://lab.c95.org/fr4nz/helium-helper/raw/branch/main/$SCRIPT_FILE_NAME - + ### CHECK FOR LOCAL SCRIPT if ! [ -f "$SCRIPT_PATH/$SCRIPT_FILE_NAME" ] ; then echo "${DATE} | Failed to update script - local file not found" >> $LOG @@ -179,19 +179,26 @@ script_version() { } +### SHOW LOG +show_log() { + xdg-open $LOG +} + ### HELP help() { echo -e "\n${LCY}${SCRIPT_NAME}${CRS}\n" echo -e "$APP_NAME_LONG automatic updater script\n" - echo -e "Syntax: $SCRIPT_FILE_NAME [ -a | -s | -h ]\n" + echo -e "Syntax: $SCRIPT_FILE_NAME [ -s | -S | -L | -h ]\n" echo -e "Options:\n" - echo -e "\t-a\tCreate alias for $SCRIPT_FILE_NAME ${YEL}--> Working with zsh${CRS}" echo -e "\t-s\tShow script version" + echo -e "\t-S\tUpdate $SCRIPT_FILE_NAME" + echo -e "\t-L\tOpen log in default text editor" echo -e "\t-h\tPrint this help page.\n" echo -e "Configured locations:\n" echo -e "\t${CYN}${INSTALL_PATH}${CRS}\t\tInstall location" echo -e "\t${CYN}${LAUNCHER_PATH}${CRS}\tLauncher location" echo -e "\t${CYN}${SCRIPT_PATH}${CRS}\t\t\tScript location\n" + echo -e "\t${CYN}${LOG_PATH}${CRS}\t\tLog location\n" } ### EXIT CLEAN @@ -207,7 +214,7 @@ exit_clean() { ########## MAIN ########## ## GET OPTIONS -while getopts ":a,:s,:S,:h" OPTION ; do +while getopts ":a,:s,:S,:L,:h" OPTION ; do case $OPTION in S) @@ -219,6 +226,10 @@ while getopts ":a,:s,:S,:h" OPTION ; do script_version exit_clean ;; + L) + show_log + exit_clean ;; + h) help exit_clean ;; diff --git a/helium_helper.sh b/helium_helper.sh index 2217b41..c51ba1f 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.6" +SCRIPT_VERSION="0.5.5" ALIAS="update-helium" ## LOCATIONS @@ -144,6 +144,7 @@ add_launcher() { sed -i "s|%APP_VERSION%|$LOCAL_VERSION|" $TMP/helium.desktop.template sed -i "s|%QUIET_UPDATE_SCRIPT%|$SCRIPT_PATH/$AUTO_SCRIPT_FILE_NAME|" $TMP/helium.desktop.template sed -i "s|%SCRIPT_UPDATE%|$SCRIPT_PATH/$AUTO_SCRIPT_FILE_NAME -S|" $TMP/helium.desktop.template + sed -i "s|%OPEN_LOG_EDITOR%|xdg-open $LOG|" $TMP/helium.desktop.template mv $TMP/helium.desktop.template $LAUNCHER_PATH/$APP_NAME.desktop mv $TMP/helium.png $CONFIG_PATH/icon echo -e "\n ${GRN}$APP_NAME_LONG launcher is set up!${CRS}" @@ -292,7 +293,14 @@ remove_helium() { rm -rf $INSTALL_PATH if [ -f "$LAUNCHER_PATH/$APP_NAME.desktop" ] ; then rm $LAUNCHER_PATH/$APP_NAME.desktop - + fi + + if [ -f "$SCRIPT_PATH/$SCRIPT_FILE_NAME" ] ; then + rm $SCRIPT_PATH/$SCRIPT_FILE_NAME + fi + + if [ -f "$SCRIPT_PATH/$AUTO_SCRIPT_FILE_NAME" ] ; then + rm $SCRIPT_PATH/$AUTO_SCRIPT_FILE_NAME fi if [ -f "$HOME/.zshrc" ] ; then