diff --git a/assets/icon/helium-icon.png b/assets/icon/helium-icon.png new file mode 100644 index 0000000..a0e28c1 Binary files /dev/null and b/assets/icon/helium-icon.png differ diff --git a/assets/icon/helium.png b/assets/icon/helium.png new file mode 100644 index 0000000..238d157 Binary files /dev/null and b/assets/icon/helium.png differ diff --git a/assets/launcher/helium.desktop.template b/assets/launcher/helium.desktop.template new file mode 100644 index 0000000..22ea353 --- /dev/null +++ b/assets/launcher/helium.desktop.template @@ -0,0 +1,24 @@ +[Desktop Entry] +Version=1.0 +Name=Helium Web Browser +GenericName=Web Browser +Comment=Access the Internet +Exec=%APP_LOCATION% %U +StartupNotify=true +StartupWMClass=helium +Terminal=false +Icon=%ICON_LOCATION% +Type=Application +Categories=Network;WebBrowser; +MimeType=application/pdf;application/rdf+xml;application/rss+xml;application/xhtml+xml;application/xhtml_xml;application/xml;image/gif;image/jpeg;image/png;image/webp;text/html;text/xml;x-scheme-handler/http;x-scheme-handler/https; +Actions=new-window;new-private-window; +X-AppImage-Version=%APP_VERSION% + +[Desktop Action new-window] +Name=New Window +Exec=%APP_LOCATION% + +[Desktop Action new-private-window] +Name=New Incognito Window +Exec=%APP_LOCATION% --incognito + diff --git a/helium_helper.sh b/helium_helper.sh index 8f41ba1..41249ad 100755 --- a/helium_helper.sh +++ b/helium_helper.sh @@ -1,6 +1,6 @@ #!/bin/bash -# HELIUM BOWSER INSTALL & UPDATE SCRIPT ---> INTERACTIVE +# Helium BOWSER INSTALL & UPDATE SCRIPT ---> INTERACTIVE ########## PREREQUISITES ########### @@ -11,18 +11,25 @@ RED="\e[0;31m" GRN="\e[0;32m" CRS="\e[0m" +## GLOBAL VARIABLES +APP_NAME="Helium" +APP_NAME_LONG="Helium Web Browser" +SOURCE="GitHub" +SCRIPT_NAME="$APP_NAME Helper Script" +SCRIPT_VERSION="0.5.1" +DATE=$(date) + ## LOCATIONS -TMP=/tmp/Helium -INSTALL_PATH=$HOME/.apps/Helium -CONFIG_PATH=$INSTALL_PATH/config +TMP=/tmp/$APP_NAME +INSTALL_PATH=$HOME/.apps/$APP_NAME +CONFIG_PATH=$INSTALL_PATH/assets +BACKUP_PATH=$INSTALL_PATH/assets/backups +LOG_PATH=$INSTALL_PATH/assets/logs +LOG=$LOG_PATH/log LAUNCHER_PATH=$HOME/.local/share/applications SCRIPT_PATH=$HOME/.local/bin #PROFILE=$HOME/.profile ### for AUTO UPDATE -## GLOBAL VARIABLES -SCRIPT_NAME="Helium Helper Script" -SCRIPT_VERSION="0.5.1" - ########## FUNCTIONS ########### ### DEPENDENCIES @@ -56,12 +63,12 @@ dependency_check () { ### CHECK LOCAL INSTALL local_check() { if ! [ -d "$INSTALL_PATH" ] ; then - echo -e "\n ${RED}Helium directory not found!${CRS}" + echo -e "\n ${RED}$APP_NAME_LONG directory not found!${CRS}" install_helium exit - elif ! [ -f "$INSTALL_PATH/helium-browser.AppImage" ] ; then - echo -e "\n ${RED}Helium directory found but no executable named ${CYN}helium-browser.AppImage${RED}!${CRS}" + elif ! [ -f "$INSTALL_PATH/$APP_NAME.AppImage" ] ; then + echo -e "\n ${RED}$APP_NAME_LONG directory found but no executable named ${CYN}$APP_NAME.AppImage${RED}!${CRS}" install_helium exit @@ -70,25 +77,24 @@ local_check() { ### INSTALL install_helium() { - if [ -f "$INSTALL_PATH/helium-browser.AppImage" ] ; then - echo -e "\n ${CYN}Helium AppImage found! Trying to update...${CRS}" + if [ -f "$INSTALL_PATH/$APP_NAME.AppImage" ] ; then + echo -e "\n ${CYN}$APP_NAME_LONG AppImage found! Trying to update...${CRS}" update_helium exit fi while true ; do - read -p " Download and install Helium from GitHub? (Y/n) : " CONFIRM_INSTALL + read -p " Download and install $APP_NAME_LONG from $SOURCE? (Y/n) : " CONFIRM_INSTALL if [[ "$CONFIRM_INSTALL" == "" || "$CONFIRM_INSTALL" == "y" || "$CONFIRM_INSTALL" == "Y" ]] ; then GIT_URL=$(curl -s https://api.github.com/repos/imputnet/helium-linux/releases/latest | grep "browser_download_url" | grep "x86_64.AppImage" | grep -v "zsync" | tr -d \" | awk '{print $2}') GIT_FILENAME=$(curl -s https://api.github.com/repos/imputnet/helium-linux/releases/latest | grep "browser_download_url" | grep "x86_64.AppImage" | grep -v "zsync" | tr -d \" | awk '{print $2}' | awk -F'/' '{print $9}') - mkdir -p $TMP wget -P $TMP $GIT_URL -q --show-progress chmod +x $TMP/$GIT_FILENAME mkdir -p $INSTALL_PATH - mv $TMP/$GIT_FILENAME $INSTALL_PATH/helium-browser.AppImage - echo -e "\n ${GRN}Helium is installed!${CRS}\n" + mv $TMP/$GIT_FILENAME $INSTALL_PATH/$APP_NAME.AppImage + echo -e "\n ${GRN}$APP_NAME_LONG is installed!${CRS}\n" exit elif [[ "$CONFIRM_INSTALL" == "n" || "$CONFIRM_INSTALL" == "N" ]] ; then @@ -105,25 +111,55 @@ install_helium() { ### LAUNCHER --> TO DO add_launcher() { - if ! [ -f "$INSTALL_PATH/helium-browser.AppImage" ] ; then - echo -e "\n ${RED}Helium AppImage not found! Can't add launcher...${CRS}" - exit - - else - echo -e "\n ${RED}Not implemented yet...${CRS}" + if [ -f "$INSTALL_PATH/$APP_NAME.AppImage" ] ; then + while true ; do + read -p " Add $APP_NAME_LONG launcher to $LAUNCHER_PATH? (Y/n) : " CONFIRM_LAUNCHER + + if [[ "$CONFIRM_LAUNCHER" == "" || "$CONFIRM_LAUNCHER" == "y" || "$CONFIRM_LAUNCHER" == "Y" ]] ; then + ASSET_URL=https://lab.c95.org/fr4nz/helium-helper/src/branch/main/assets + LOCAL_VERSION=$($INSTALL_PATH/$APP_NAME.AppImage --version | awk '{print $2}') + wget -P $TMP $ASSET_URL -q --show-progress + sed -i "s|%APP_LOCATION%|$INSTALL_PATH/$APP_NAME.AppImage|" $TMP/assets/launcher/helium.desktop.template + sed -i "s|%ICON_LOCATION%|$INSTALL_PATH/$CONFIG_PATH/icon/helium.png|" $TMP/assets/launcher/helium.desktop.template + sed -i "s|%APP_VERSION%|$LOCAL_VERSION|" $TMP/assets/launcher/helium.desktop.template + mkdir -p $LAUNCHER_PATH + mv $TMP/assets/launcher/helium.desktop.template $LAUNCHER_PATH/$APP_NAME.desktop + rm $TMP/assets/launcher + mv $TMP/assets $CONFIG_PATH + echo -e "\n ${GRN}$APP_NAME_LONG launcher is set up!${CRS}\n" + exit + + elif [[ "$CONFIRM_LAUNCHER" == "n" || "$CONFIRM_LAUNCHER" == "N" ]] ; then + echo -e "\n ${RED}Launcher creation cancelled!${CRS}\n" + exit + + else + echo -e " ${YEL}Invalid response!${CRS}\n" + + fi + + done + + elif [ -f "$LAUNCHER_PATH/$APP_NAME.desktop" ] ; then + echo -e "\n ${RED}${APP_NAME}.desktop already exists!${CRS}" exit + else + echo -e "\n ${RED}$APP_NAME_LONG AppImage not found! Can't add launcher...${CRS}" + install_helium + exit + fi } ### UPDATE update_helium() { - LOCAL_VERSION=$($INSTALL_PATH/helium-browser.AppImage --version | awk '{print $2}') + LOCAL_VERSION=$($INSTALL_PATH/$APP_NAME.AppImage --version | awk '{print $2}') GIT_VERSION=$(curl -s https://api.github.com/repos/imputnet/helium-linux/releases/latest | grep "tag_name" | tr -d \", | awk '{print $2}') ### CHECK FOR EMPTY VERSION TAGS if [ -z "$GIT_VERSION" ] ; then - echo -e "\n ${RED}Empty version tag from ${CYN}GitHub${RED}! Can't compare, exiting...${CRS}" + echo -e "\n ${RED}Empty version tag from ${CYN}$SOURCE${RED}! Can't compare, exiting...${CRS}" exit elif [ -z "$LOCAL_VERSION" ] ; then @@ -137,15 +173,15 @@ update_helium() { GIT_VERSION_NUM=$(echo $GIT_VERSION | tr -d .) if [ "$GIT_VERSION" == "$LOCAL_VERSION" ] ; then - echo -e "\n ${GRN}Helium is already up-to-date!${CRS}\n" + echo -e "\n ${GRN}$APP_NAME_LONG is already up-to-date!${CRS}\n" elif [ "$GIT_VERSION_NUM" -gt "$LOCAL_VERSION_NUM" ] ; then - echo -e "\n ${RED}Helium is updatable!${CRS}\n" + echo -e "\n ${RED}$APP_NAME_LONG is updatable!${CRS}\n" echo -e " ${CYN}Local Version :\t${CRS}${LOCAL_VERSION}" - echo -e " ${CYN}GitHub Version :\t${CRS}${GIT_VERSION}\n" + echo -e " ${CYN}$SOURCE Version :\t${CRS}${GIT_VERSION}\n" while true ; do - read -p " Download and update Helium from GitHub? (Y/n) : " CONFIRM + read -p " Download and update $APP_NAME_LONG from $SOURCE? (Y/n) : " CONFIRM if [[ "$CONFIRM" == "" || "$CONFIRM" == "y" || "$CONFIRM" == "Y" ]] ; then GIT_URL=$(curl -s https://api.github.com/repos/imputnet/helium-linux/releases/latest | grep "browser_download_url" | grep "x86_64.AppImage" | grep -v "zsync" | tr -d \" | awk '{print $2}') @@ -153,12 +189,12 @@ update_helium() { mkdir -p $TMP wget -P $TMP $GIT_URL -q --show-progress chmod +x $TMP/$GIT_FILENAME - if [ -f "$INSTALL_PATH/helium-browser.OldAppImage" ] ; then - rm $INSTALL_PATH/helium-browser.OldAppImage + if [ -f "$INSTALL_PATH/$APP_NAME.old" ] ; then + rm $INSTALL_PATH/$APP_NAME.old fi - mv $INSTALL_PATH/helium-browser.AppImage $INSTALL_PATH/helium-browser.Old - mv $TMP/$GIT_FILENAME $INSTALL_PATH/helium-browser.AppImage - echo -e "\n ${GRN}Helium is up-to-date !${CRS}\n" + mv $INSTALL_PATH/$APP_NAME.AppImage $INSTALL_PATH/$APP_NAME.old + mv $TMP/$GIT_FILENAME $INSTALL_PATH/$APP_NAME.AppImage + echo -e "\n ${GRN}$APP_NAME_LONG is up-to-date !${CRS}\n" break elif [[ "$CONFIRM" == "n" || "$CONFIRM" == "N" ]] ; then @@ -175,7 +211,7 @@ update_helium() { 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}GitHub Version :\t${CRS}${GIT_VERSION}\n" + echo -e " ${CYN}$SOURCE Version :\t${CRS}${GIT_VERSION}\n" echo -e " ${RED}Update failed... Exiting...${CRS}\n" exit @@ -185,8 +221,8 @@ update_helium() { ### AUTOMATIC UPDATE --> TO DO auto_update() { - if ! [ -f "$INSTALL_PATH/helium-browser.AppImage" ] ; then - echo -e "\n ${RED}Helium AppImage not found! Can't add auto update script...${CRS}" + if ! [ -f "$INSTALL_PATH/$APP_NAME.AppImage" ] ; then + echo -e "\n ${RED}$APP_NAME AppImage not found! Can't add auto update script...${CRS}" exit else @@ -201,11 +237,11 @@ remove_helium() { if [ -d "$INSTALL_PATH" ] ; then while true ; do - read -p " Remove Helium folder ${INSTALL_PATH}? (Y/n) : " CONFIRM_REMOVE + read -p " Remove $APP_NAME_LONG folder $INSTALL_PATH? (Y/n) : " CONFIRM_REMOVE if [[ "$CONFIRM_REMOVE" == "" || "$CONFIRM_REMOVE" == "y" || "$CONFIRM_REMOVE" == "Y" ]] ; then rm -rf $INSTALL_PATH - echo -e "\n ${RED}Helium removed!${CRS}\n" + echo -e "\n ${RED}$APP_NAME_LONG removed!${CRS}\n" exit elif [[ "$CONFIRM_REMOVE" == "n" || "$CONFIRM_REMOVE" == "N" ]] ; then @@ -220,7 +256,7 @@ remove_helium() { done else - echo -e "\n ${RED}Can't remove Helium! ${YEL}${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}\n" exit fi @@ -228,15 +264,15 @@ remove_helium() { ### SCRIPT VERSION script_version() { - echo -e "\n ${CYN}Helium Helper Script Version : ${GRN}${SCRIPT_VERSION}${CRS}\n" + echo -e "\n ${CYN}$APP_NAME_LONG Helper Script Version : ${GRN}${SCRIPT_VERSION}${CRS}\n" exit } ### UPDATE SCRIPT --> TO DO update_script() { - if ! [ -f "$INSTALL_PATH/helium-browser.AppImage" ] ; then - echo -e "\n ${RED}Helium AppImage not found! Can't update script...${CRS}" + if ! [ -f "$INSTALL_PATH/$APP_NAME.AppImage" ] ; then + echo -e "\n ${RED}$APP_NAME_LONG AppImage not found! Can't update script...${CRS}" exit else @@ -248,12 +284,12 @@ update_script() { ### COMPARE APPIMAGE VERSION compare_version() { - LOCAL_VERSION=$($INSTALL_PATH/helium-browser.AppImage --version | awk '{print $2}') + LOCAL_VERSION=$($INSTALL_PATH/$APP_NAME.AppImage --version | awk '{print $2}' >/dev/null 2>&1) GIT_VERSION=$(curl -s https://api.github.com/repos/imputnet/helium-linux/releases/latest | grep "tag_name" | tr -d \", | awk '{print $2}') ### CHECK FOR EMPTY VERSION TAGS if [ -z "$GIT_VERSION" ] ; then - echo -e "\n ${RED}Empty version tag from ${CYN}GitHub${RED}! Can't compare, exiting...${CRS}" + echo -e "\n ${RED}Empty version tag from ${CYN}$SOURCE${RED}! Can't compare, exiting...${CRS}" exit elif [ -z "$LOCAL_VERSION" ] ; then @@ -267,21 +303,21 @@ compare_version() { GIT_VERSION_NUM=$(echo $GIT_VERSION | tr -d .) if [ "$GIT_VERSION" == "$LOCAL_VERSION" ] ; then - echo -e "\n ${GRN}Helium is up-to-date!${CRS}\n" + 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}GitHub Version :\t${CRS}${GIT_VERSION}\n" + echo -e " ${CYN}$SOURCE Version :\t${CRS}${GIT_VERSION}\n" exit elif [ "$GIT_VERSION_NUM" -gt "$LOCAL_VERSION_NUM" ] ; then - echo -e "\n ${YEL}Helium is updatable!${CRS}\n" + echo -e "\n ${YEL}$APP_NAME_LONG is updatable!${CRS}\n" echo -e " ${CYN}Local Version :\t${CRS}${LOCAL_VERSION}" - echo -e " ${CYN}GitHub Version :\t${CRS}${GIT_VERSION}\n" + echo -e " ${CYN}$SOURCE Version :\t${CRS}${GIT_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}GitHub Version :\t${CRS}${GIT_VERSION}\n" + echo -e " ${CYN}$SOURCE Version :\t${CRS}${GIT_VERSION}\n" echo -e " ${RED}Update failed ... Exiting ...${CRS}\n" exit @@ -291,14 +327,14 @@ compare_version() { ### HELP help() { echo -e "\n${CYN}${SCRIPT_NAME}${CRS}\n" - echo -e "Helium Browser installer & updater script\n" - echo -e "Syntax: helium_helper.sh [ -i | -L | -u | -U | -r | -c | -s | -S | -h ]\n" + echo -e "$APP_NAME_LONG installer & updater script\n" + echo -e "Syntax: ${APP_NAME}_helper.sh [ -i | -L | -u | -U | -r | -c | -s | -S | -h ]\n" echo -e "Options:\n" - echo -e "\t-i\tDownload & install Helium from GitHub" + echo -e "\t-i\tDownload & install $APP_NAME_LONG from $SOURCE" echo -e "\t-L\tCreate desktop launcher ${RED}--> Not yet working${CRS}" - echo -e "\t-u\tDownload & update Helium from GitHub" + 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 Helium" + echo -e "\t-r\tRemove $APP_NAME_LONG" echo -e "\t-c\tCompare local to remote version" echo -e "\t-s\tShow script version" echo -e "\t-S\tUpdate script ${RED}--> Not yet working${CRS}" @@ -325,22 +361,25 @@ exit_clean() { while getopts ":i,:L,:u,:U,:r,:c,:s,:S,:h" OPTION ; do case $OPTION in i) - echo -e "\n ${YEL}Installing Helium Browser...${CRS}" + echo -e "\n ${YEL}Installing $APP_NAME_LONG...${CRS}" dependency_check + local_check install_helium exit_clean exit ;; L) - echo -e "\n ${YEL}Adding Helium Browser launcher...${CRS}" + echo -e "\n ${YEL}Adding $APP_NAME_LONG launcher...${CRS}" dependency_check + local_check add_launcher exit_clean exit ;; u) - echo -e "\n ${YEL}Updating Helium Browser...${CRS}" + echo -e "\n ${YEL}Updating $APP_NAME_LONG...${CRS}" dependency_check + local_check update_helium exit_clean exit ;; @@ -348,18 +387,20 @@ while getopts ":i,:L,:u,:U,:r,:c,:s,:S,:h" OPTION ; do U) echo -e "\n ${YEL}Enabling automatic updates...${CRS}" dependency_check + local_check auto_update exit_clean exit ;; r) - echo -e "\n ${YEL}Removing Helium Browser...${CRS}" + echo -e "\n ${YEL}Removing $APP_NAME_LONG...${CRS}" remove_helium exit ;; c) echo -e "\n ${YEL}Comparing remote to local version...${CRS}" dependency_check + local_check compare_version exit_clean exit ;; @@ -371,6 +412,7 @@ while getopts ":i,:L,:u,:U,:r,:c,:s,:S,:h" OPTION ; do S) echo -e "\n ${YEL}Updating script...${CRS}" dependency_check + local_check update_script exit_clean exit ;; diff --git a/todo.md b/todo.md index 8a1350a..da806f5 100644 --- a/todo.md +++ b/todo.md @@ -16,6 +16,8 @@ - Internet connectivity check in [Auto Update Script](https://lab.c95.org/fr4nz/helium-helper/src/branch/main/helium_auto_update.sh) - Desktop entry [Helper Script](https://lab.c95.org/fr4nz/helium-helper/src/branch/main/helium_helper.sh) - Desktop entry updater [Helper Script](https://lab.c95.org/fr4nz/helium-helper/src/branch/main/helium_helper.sh) & [Auto Update Script](https://lab.c95.org/fr4nz/helium-helper/src/branch/main/helium_auto_update.sh) +- Auto update setup + - shell recognition - Script updater - Architecture detection - Uninstaller --> Partially done