noprompt & shutdownonbackup #1098

variable renaming as well, maxbackupdays

lgsm/functions/command_backup.sh

@@ -18,24 +18,10 @@ fn_check_pending_backup(){
 	if [ -f "${tmpdir}/.backup.lock" ]; then
 		fn_print_warning_nl "A backup is currently running or has been aborted."
 		fn_script_log_warn "A backup is currently running or has been aborted"
-		if [ "${backupnoprompt}" == "1" ]; then
 			# Exit if is in noprompt mode
-			fn_print_error "Backup already in progress"
+			fn_print_error "Backup already in progress."
 			fn_script_log_fatal "Backup already in progress"
 			core_exit.sh
-		else
-			# Prompts user if in regular mode
-			while true; do
-				read -e -i "y" -p "Continue anyway? [Y/N]" yn
-				case $yn in
-				[Yy]* ) fn_script_log "User continues anyway"; break;;
-				[Nn]* ) echo Exiting; fn_script_log "User aborted"; return;;
-				* ) echo "Please answer yes or no.";;
-			esac
-			done
-			echo ""
-		fi
-	fi
 }
 
 # Initialization
@@ -50,43 +36,31 @@ fn_backup_init(){
 	fn_script_log "A total of ${rootdirduexbackup} will be compressed into the following backup: ${backupdir}/${backupname}.tar.gz"
 	echo "${backupdir}/${backupname}.tar.gz"
 	echo ""
-	# Prompt to start the backup if not in noprompt mode
-	if [ "${backupnoprompt}" != "1" ]; then
-		while true; do
-			read -e -i "y" -p "Continue? [Y/n]" yn
-			case $yn in
-			[Yy]* ) fn_script_log "User validates"; break;;
-			[Nn]* ) echo "Exiting"; fn_script_log "User aborted"; return;;
-			* ) echo "Please answer yes or no.";;
-		esac
-		done
-		echo ""
-	fi
 }
 
 
-# Check if server is started
+# Check if server is started and wether to shut it down
 fn_backup_stop_server(){
 	check_status.sh
-	if [ "${status}" != "0" ]; then
+	echo ""
-		echo ""
+	# Server is shut down
-		fn_print_warning_nl "${servicename} is currently running."
+	if [ "${status}" == "0" ]; then
-		fn_script_log_warn "${servicename} is currently running"
+		serverstopped="no"
-		sleep 0.5
+	# Server is up and shutdownonbackup is off
-		if [ "${backupnoprompt}" == "1" ]; then
+	elif [ "${shutdownonbackup}" == "off" ]; then
-			# Don't stop the server in noprompt mode
+		serverstopped="no"
-			serverstopped="no"
+		fn_print_warning_nl "${servicename} is started and will not be stopped."
-		else
+		fn_print_info_nl "It is advised to shutdown the server to prevent a file change during compression resulting in a tar error."
-			# Otherwise ask the user if it should be stopped or not
+		fn_script_log_warn "${servicename} is started during the backup"
-			while true; do
+		fn_script_log_info "It is advised to shutdown the server to prevent a file change during compression resulting in a tar error."
-				read -e -i "n" -p "Stop ${servicename} while running the backup? [y/N]" yn
+	# Server is up and will be stopped if shutdownonbackup has no value or anything else than "off"
-				case $yn in
+	else
-				[Yy]* ) exitbypass=1; fn_script_log "User choose to stop the server"; command_stop.sh; serverstopped="yes"; break;;
+		fn_print_warning_nl "${servicename} will be stopped during the backup."
-				[Nn]* ) fn_script_log "User choose to not stop the server"; serverstopped="no"; break;;
+		fn_script_log_warn "${servicename} will be stopped during the backup"
-				* ) echo "Please answer yes or no.";;
+		sleep 4
-			esac
+		serverstopped="yes"
-			done
+		exitbypass=1
-		fi
+		command_stop.sh
 	fi
 }
 
@@ -163,36 +137,21 @@ fn_backup_summary(){
 
 # Clear old backups according to maxbackups and maxbackupdays variables
 fn_backup_clearing(){
-	if [ -n "${backupdays}" ]; then
+	if [ -n "${maxbackupdays}" ]; then
 		# Count how many backups can be cleared
-		backupclearcount=$(find "${backupdir}"/ -type f -mtime +"${backupdays}"|wc -l)
+		backupclearcount=$(find "${backupdir}"/ -type f -mtime +"${maxbackupdays}"|wc -l)
 		# Check if there is any backup to clear
 		if [ "${backupclearcount}" -ne "0" ]; then
-			fn_print_info_nl "${backupclearcount} backups older than ${backupdays} days can be cleared."
+			fn_print_info_nl "${backupclearcount} backups older than ${maxbackupdays} days can be cleared."
-			fn_script_log "${backupclearcount} backups older than ${backupdays} days can be cleared"
+			fn_script_log "${backupclearcount} backups older than ${maxbackupdays} days can be cleared"
-			if [ "${backupnoprompt}" != "1" ]; then
+			find "${backupdir}"/ -mtime +"${maxbackupdays}" -type f -exec rm -f {} \;
-				while true; do
+			fn_print_ok_nl "Cleared ${backupclearcount} backups."
-					read -e -p "Clear older backups? [Y/N]" yn
+			fn_script_log_pass "Cleared ${backupclearcount} backups"
-					case $yn in
-					[Yy]* ) clearoldbackups="yes"; break;;
-					[Nn]* ) clearoldbackups="no"; fn_script_log "Not clearing backups"; break;;
-					* ) echo "Please answer yes or no.";;
-				esac
-				done
-			else
-				clearoldbackups="yes"
-			fi
-			# If user wants to clear backups or if noprompt
-			if [ "${clearoldbackups}" == "yes" ]; then
-				find "${backupdir}"/ -mtime +"${backupdays}" -type f -exec rm -f {} \;
-				fn_print_ok_nl "Cleared ${backupclearcount} backups."
-				fn_script_log_pass "Cleared ${backupclearcount} backups"
-			fi
 		else
-			fn_script_log "No backups older than ${backupdays} days were found"
+			fn_script_log "No backups older than ${maxbackupdays} days were found"
 		fi
 	else
-		fn_script_log "No backups to clear since backupdays variable is empty"
+		fn_script_log "No backups to clear since maxbackupdays variable is empty"
 	fi
 }