Compare commits
No commits in common. "b0ce07b9e12d819fbed5e1997d80aa8e47ab35ee" and "e7580571ced1efa060822132ab5522666ec3236d" have entirely different histories.
b0ce07b9e1
...
e7580571ce
1 changed files with 9 additions and 10 deletions
|
|
@ -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}\n"
|
echo -e "\n ${RED}Empty version tag from ${CYN}$APP_SOURCE${RED}! Can't compare, exiting...${CRS}"
|
||||||
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}\n"
|
echo -e "\n ${RED}Empty version tag from ${CYN}local AppImage${RED}! Can't compare, exiting...${CRS}"
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -318,7 +318,7 @@ update_application() {
|
||||||
|
|
||||||
### BACKUP
|
### BACKUP
|
||||||
call_backup() {
|
call_backup() {
|
||||||
if [ $(ls $BACKUP_PATH\/$APP_NAME\.$BACKUP_METHOD\.backup_* | wc -l) -gt "1" ] ; then
|
if [ -f $BACKUP_PATH\/$APP_NAME\.$BACKUP_METHOD\.backup_* ] ; 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,6 +331,7 @@ 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
|
||||||
|
|
@ -338,8 +339,6 @@ call_backup() {
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
${BACKUP_METHOD}_backup
|
|
||||||
}
|
}
|
||||||
|
|
||||||
backup_logger() {
|
backup_logger() {
|
||||||
|
|
@ -469,9 +468,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
|
||||||
|
|
@ -645,11 +644,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}\n"
|
echo -e "\n ${RED}Empty version tag from ${CYN}local script${RED}! Can't compare, exiting...${CRS}"
|
||||||
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}\n"
|
echo -e "\n ${RED}Empty version tag from ${CYN}remote script${RED}! Can't compare, exiting...${CRS}"
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue