Merge main

This commit is contained in:
Fr4nz D13trich 2026-02-20 11:45:53 +01:00
commit fe1dea14bd
10 changed files with 8309 additions and 3 deletions

View file

@ -23,7 +23,11 @@ BACKUP_COMPRESSION_OVERRIDE=""
SCRIPT_NAME="$APP_NAME Helper Script"
SCRIPT_FILE_NAME="helium_helper.sh"
AUTO_SCRIPT_FILE_NAME="helium_launcher_update.sh"
<<<<<<< HEAD
SCRIPT_VERSION="0.5.9.1"
=======
SCRIPT_VERSION="0.5.9.2"
>>>>>>> main
ALIAS="helium-helper"
DATE=$(date +"%d%m%y")
@ -40,8 +44,13 @@ LAUNCHER_PATH=$HOME/.local/share/applications
SCRIPT_PATH=$HOME/.local/bin
## REMOTE LOCATIONS
<<<<<<< HEAD
REMOTE_REPO_BRANCH="stable"
REMOTE_REPO_URL=https://lab.c95.org/fr4nz/helium-helper/raw/branch/$REMOTE_REPO_BRANCH
=======
REMOTE_REPO_BRANCH="main"
REMOTE_REPO_URL=https://git.h0ster.org/fr4nz/helium-helper/raw/branch/$REMOTE_REPO_BRANCH
>>>>>>> main
REMOTE_SCRIPT_URL=$REMOTE_REPO_URL/$SCRIPT_FILE_NAME
APP_SOURCE_URL=https://api.github.com/repos/imputnet/helium-linux/releases/latest
@ -302,11 +311,13 @@ update_application() {
### COMPARE LOCAL & REMOTE VERSION
LOCAL_VERSION_NUM=$(echo $LOCAL_VERSION | tr -d .)
APP_SOURCE_VERSION_NUM=$(echo $APP_SOURCE_VERSION | tr -d .)
APP_SOURCE_VERSION_NUM=$(echo "1.$APP_SOURCE_VERSION_NUM")
LOCAL_VERSION_NUM=$(echo "1.$LOCAL_VERSION_NUM")
if [ "$APP_SOURCE_VERSION" == "$LOCAL_VERSION" ] ; then
echo -e "\n ${GRN}$APP_NAME_LONG is already up-to-date!${CRS}\n"
elif [ "$APP_SOURCE_VERSION_NUM" -gt "$LOCAL_VERSION_NUM" ] ; then
elif [ $(echo "$APP_SOURCE_VERSION_NUM > $LOCAL_VERSION_NUM" | bc -l) -eq 1 ] ; then
echo -e "\n ${LCY}$APP_NAME_LONG is updatable!${CRS}\n"
app_version_info
@ -924,7 +935,11 @@ help() {
echo -e "\t-a\tCreate alias for $SCRIPT_FILE_NAME"
echo -e "\t-u\tUpdate $APP_NAME_LONG from $APP_SOURCE"
echo -e "\t-b\tBackup $APP_NAME_LONG & configuration"
<<<<<<< HEAD
echo -e "\t-B\tRestore $APP_NAME_LONG & configuration from backup"
=======
#echo -e "\t-B\tRestore $APP_NAME_LONG & configuration from backup"
>>>>>>> main
echo -e "\t-r\tRemove $APP_NAME_LONG"
echo -e "\t-c\tCompare local to remote version"
echo -e "\t-s\tShow script version"