Backup function fixed if pbzip2 was not installed
This commit is contained in:
parent
8bace469da
commit
1f1573f58c
1 changed files with 34 additions and 11 deletions
|
|
@ -63,8 +63,7 @@ dependency_check () {
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ -f "$TMP/missingDeps" ] ; then
|
if [ -f "$TMP/missingDeps" ] ; then
|
||||||
MISSING=$(cat $TMP/missingDeps)
|
echo -e " ${RED}Following dependencies are missing :\n\n${CRS}$(cat $TMP/missingDeps)\n\n ${CYN}Please install and re-run script !${CRS}\n"
|
||||||
echo -e " ${RED}Following dependencies are missing :\n\n${CRS}$MISSING\n\n ${CYN}Please install and re-run script !${CRS}\n"
|
|
||||||
exit_clean
|
exit_clean
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
@ -265,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
|
||||||
|
|
||||||
|
|
@ -319,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,16 +330,18 @@ 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 -rf $BACKUP_PATH/$APP_NAME.$BACKUP_METHOD.backup_*
|
||||||
|
${BACKUP_METHOD}_backup
|
||||||
break
|
break
|
||||||
|
|
||||||
else
|
else
|
||||||
echo -e "\n ${YEL}Invalid response!${CRS}\n"
|
echo -e "\n ${YEL}Invalid response!${CRS}\n"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
else
|
||||||
|
${BACKUP_METHOD}_backup
|
||||||
fi
|
fi
|
||||||
|
|
||||||
${BACKUP_METHOD}_backup
|
|
||||||
}
|
}
|
||||||
|
|
||||||
backup_logger() {
|
backup_logger() {
|
||||||
|
|
@ -371,7 +372,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
|
||||||
|
|
@ -470,9 +471,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
|
||||||
|
|
@ -522,6 +523,27 @@ pack_backup() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
### RESTORE BACKUP
|
||||||
|
restore_backup() {
|
||||||
|
if [ $(ls $BACKUP_PATH\/$APP_NAME\.*.backup_* | wc -l) -gt "1" ] ; then
|
||||||
|
NUMBER=1
|
||||||
|
mkdir -p $TMP/backup_restore
|
||||||
|
CWD=$(pwd)
|
||||||
|
cd $BACKUP_PATH
|
||||||
|
RESTORE_OPTIONS=$(ls -lt $APP_NAME\.*.backup_* | awk '{print $9}')
|
||||||
|
|
||||||
|
for RESTORE_TARGET in ${RESTORE_OPTIONS[@]} ; do
|
||||||
|
echo "$NUMBER - $RESTORE_TARGET" >> $TMP/backup_restore/options
|
||||||
|
NUMBER=$(($NUMBER+1))
|
||||||
|
done
|
||||||
|
|
||||||
|
cd $CWD
|
||||||
|
echo -e "$(cat $TMP/backup_restore/options)"
|
||||||
|
rm -rf $TMP
|
||||||
|
fi
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
### REMOVE
|
### REMOVE
|
||||||
remove_application() {
|
remove_application() {
|
||||||
if [ -d "$INSTALL_PATH" ] ; then
|
if [ -d "$INSTALL_PATH" ] ; then
|
||||||
|
|
@ -846,6 +868,7 @@ while getopts ":i,:l,:a,:u,:b,:r,:c,:s,:S,:h" OPTION ; do
|
||||||
|
|
||||||
h)
|
h)
|
||||||
help
|
help
|
||||||
|
restore_backup
|
||||||
exit ;;
|
exit ;;
|
||||||
|
|
||||||
*)
|
*)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue