fr4nz/helium-helper
fr4nz/helium-helper
1
0
Fork 0
Code Issues 2 Pull requests Projects 2 Releases 5 Packages Wiki Activity Actions

Merge backup fix from main

Browse source
This commit is contained in:
Fr4nz D13trich 2026-01-12 19:22:23 +01:00
commit b0ce07b9e1
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
helium_helper.sh
View file

@ -264,11 +264,11 @@ update_application() {
### CHECK FOR EMPTY VERSION TAGS ### CHECK FOR EMPTY VERSION TAGS
if [ -z "$APP_SOURCE_VERSION" ] ; then if [ -z "$APP_SOURCE_VERSION" ] ; then
echo -e "\n ${RED}Empty version tag from ${CYN}$APP_SOURCE${RED}! Can't compare, exiting...${CRS}" echo -e "\n ${RED}Empty version tag from ${CYN}$APP_SOURCE${RED}! Can't compare, exiting...${CRS}\n"
exit exit
elif [ -z "$LOCAL_VERSION" ] ; then elif [ -z "$LOCAL_VERSION" ] ; then
echo -e "\n ${RED}Empty version tag from ${CYN}local AppImage${RED}! Can't compare, exiting...${CRS}" echo -e "\n ${RED}Empty version tag from ${CYN}local AppImage${RED}! Can't compare, exiting...${CRS}\n"
exit exit
fi fi
@ -318,7 +318,7 @@ update_application() {
### BACKUP ### BACKUP
call_backup() { call_backup() {
if [ -f $BACKUP_PATH\/$APP_NAME\.$BACKUP_METHOD\.backup_* ] ; then if [ $(ls $BACKUP_PATH\/$APP_NAME\.$BACKUP_METHOD\.backup_* | wc -l) -gt "1" ] ; then
echo -e "\n ${CYN}A $BACKUP_METHOD backup already exists!${CRS}\n" echo -e "\n ${CYN}A $BACKUP_METHOD backup already exists!${CRS}\n"
while true ; do while true ; do
@ -331,7 +331,6 @@ call_backup() {
elif [[ "$OVERWRITE_BACKUP" == "y" || "$OVERWRITE_BACKUP" == "Y" ]] ; then elif [[ "$OVERWRITE_BACKUP" == "y" || "$OVERWRITE_BACKUP" == "Y" ]] ; then
echo -e "\n ${YEL}Overwriting backup...${CRS}" echo -e "\n ${YEL}Overwriting backup...${CRS}"
rm $BACKUP_PATH/$APP_NAME.$BACKUP_METHOD.backup_* rm $BACKUP_PATH/$APP_NAME.$BACKUP_METHOD.backup_*
${BACKUP_METHOD}_backup
break break
else else
@ -339,6 +338,8 @@ call_backup() {
fi fi
done done
fi fi
${BACKUP_METHOD}_backup
} }
backup_logger() { backup_logger() {
@ -369,7 +370,7 @@ backup_logger() {
echo " - Shell : $ACTIVE_SHELL" >> $TMP/backup/conf_log echo " - Shell : $ACTIVE_SHELL" >> $TMP/backup/conf_log
echo " - Alias : FALSE" >> $TMP/backup/conf_log echo " - Alias : FALSE" >> $TMP/backup/conf_log
fi fi
LOGGABLE=("$INSTALL_PATH/$APP_NAME.$FILE_EXTENSION" "$SCRIPT_PATH/$SCRIPT_FILE_NAME" "$SCRIPT_PATH/$AUTO_SCRIPT_FILE_NAME" "$LAUNCHER_PATH/$APP_NAME.desktop" "$APP_CONFIG_PATH") LOGGABLE=("$INSTALL_PATH/$APP_NAME.$FILE_EXTENSION" "$SCRIPT_PATH/$SCRIPT_FILE_NAME" "$SCRIPT_PATH/$AUTO_SCRIPT_FILE_NAME" "$LAUNCHER_PATH/$APP_NAME.desktop" "$APP_CONFIG_PATH")
for LOG_ITEM in ${LOGGABLE[@]} ; do for LOG_ITEM in ${LOGGABLE[@]} ; do
@ -468,9 +469,9 @@ pack_backup() {
COMPRESSION_METHOD=("pbzip2" "gzip" "bzip2" "zip") COMPRESSION_METHOD=("pbzip2" "gzip" "bzip2" "zip")
until [ "$BACKUP_COMPRESSION" ] ; do until [ "$BACKUP_COMPRESSION" ] ; do
for COMPRESSION_TYPE in ${COMPRESSION_METHOD[@]} ; do for COMPRESSION_TYPE in "${COMPRESSION_METHOD[@]}" ; do
if [ "$(command -v $COMPRESSION_TYPE) > /dev/null 2>&1" ] ; then if command -v $COMPRESSION_TYPE > /dev/null 2>&1 ; then
BACKUP_COMPRESSION=$COMPRESSION_TYPE BACKUP_COMPRESSION=$COMPRESSION_TYPE
break break
fi fi
@ -644,11 +645,11 @@ update_script() {
### CHECK FOR EMPTY VERSION TAGS ### CHECK FOR EMPTY VERSION TAGS
if [ -z "$SCRIPT_VERSION" ] ; then if [ -z "$SCRIPT_VERSION" ] ; then
echo -e "\n ${RED}Empty version tag from ${CYN}local script${RED}! Can't compare, exiting...${CRS}" echo -e "\n ${RED}Empty version tag from ${CYN}local script${RED}! Can't compare, exiting...${CRS}\n"
exit exit
elif [ -z "$REMOTE_SCRIPT_VERSION" ] ; then elif [ -z "$REMOTE_SCRIPT_VERSION" ] ; then
echo -e "\n ${RED}Empty version tag from ${CYN}remote script${RED}! Can't compare, exiting...${CRS}" echo -e "\n ${RED}Empty version tag from ${CYN}remote script${RED}! Can't compare, exiting...${CRS}\n"
exit exit
fi fi