X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=bin%2Fbackup-script;h=89b066db8bddddcabff66b15c30df1ebfd161e62;hb=d1df3a8e7472d91b1356fcb20862bc738f3d0215;hp=70173f05e5d6b6898d1a307752c7c3e148f8af4b;hpb=b0ac6a11a5594d8445d3cd6ba1ec0d56bd21ebcc;p=backup-script.git

diff --git a/bin/backup-script b/bin/backup-script
index 70173f0..89b066d 100755
--- a/bin/backup-script
+++ b/bin/backup-script
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # backup-script system for cloning systems using rsync
-# Copyright (c)2008-2016 Alexander Barton <alex@barton.de>
+# Copyright (c)2008-2017 Alexander Barton <alex@barton.de>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -53,28 +53,36 @@ default_job_pre_exec=""
 default_job_post_exec=""
 default_tags=""
 
+# Set shell options.
+shopt -s nullglob
+
 Usage() {
-	echo "Usage: $NAME [<options>] [<system> [<system> [...]]]"
-	echo
-	echo "  -n, --dry-run       Test run only, don't copy any data."
-	echo "  -p, --progress      Show progress, see rsync(1)."
-	echo "  -t TAG, --tag TAG   Only run jobs with tag TAG."
-	echo "  -x, --no-exec       Don't run global pre-/post-exec commands."
-	echo
-	echo "When no <system> is given, all defined systems are used."
-	echo
-	# shellcheck disable=SC2086
-	echo -e $config_info
-	echo
+	{
+		echo "Usage: $NAME [<options>] [<job> [<job> [...]]]"
+		echo
+		echo "  -n, --dry-run       Test run only, don't copy any data."
+		echo "  -p, --progress      Show progress, see rsync(1)."
+		echo "  -t TAG, --tag TAG   Only run jobs with tag TAG."
+		echo "  -x, --no-exec       Don't run global pre-/post-exec commands."
+		echo
+		echo "When no <job> is given, all defined systems are used."
+		echo
+		# shellcheck disable=SC2086
+		echo -e $config_info
+		echo
+	} >&2
 	exit 2
 }
 
+ErrorMsg () {
+	printf "%s\\n" "$@" >&2
+}
+
 CleanUp() {
 	if [[ -n "$pre_exec" && $PREPOSTEXEC -ne 0 ]]; then
 		echo "Executing \"$post_exec\" ..."
-		sh -c $post_exec
-		if [ $? -ne 0 ]; then
-			echo "Warning: post-exec command failed!"
+		if ! sh -c $post_exec; then
+			ErrorMsg "Warning: post-exec command failed!"
 		fi
 		echo
 	fi
@@ -83,10 +91,10 @@ CleanUp() {
 
 GotSignal() {
 	echo
-	echo "--> Got signal, cleaning up & aborting ..."
+	ErrorMsg "--> Got signal, cleaning up & aborting ..."
 	echo
 	CleanUp
-	echo -n "Aborted: "; date
+	ErrorMsg "Aborted: $(date)" >&2
 	echo
 	sleep 3
 	exit 9
@@ -99,7 +107,7 @@ ExecJob() {
 	echo "Running job ${what}-exec command ..."
 	[ "$local" -eq 0 ] \
 		&& cmd="$ssh_cmd ${user}@${system} $cmd"
-	echo -n "Start date (${what}-exec): "; date
+	echo "Start date (${what}-exec): $(date)"
 	echo "$cmd"
 	if [ "$DRYRUN" -eq 0 ]; then
 		$SHELL -c "$cmd"; local ret=$?
@@ -107,9 +115,11 @@ ExecJob() {
 		echo " *** Trial run, not executing ${what}-exec command!"
 		ret=0
 	fi
-	[ $ret -eq 0 ] \
-		&& echo "The ${what}-exec command completed with status 0, OK." \
-		|| echo "The ${what}-exec command completed with ERRORS, code $ret!"
+	if [ $ret -eq 0 ]; then
+		echo "The ${what}-exec command completed with status 0, OK."
+	else
+		ErrorMsg "The ${what}-exec command completed with ERRORS, code $ret!"
+	fi
 	return $ret
 }
 
@@ -143,7 +153,7 @@ CreateSubvolume() {
 		zfs create "$(echo "$volume" | cut -c2-)" || return 1
 		;;
 	  *)
-		echo "CreateSubvolume: Incompatible FS type \"$fs\" on \"$dir\"!"
+		ErrorMsg "CreateSubvolume: Incompatible FS type \"$fs\" on \"$dir\"!"
 		return 9
 	esac
 	return 0
@@ -171,7 +181,7 @@ CloneSubvolume() {
 			"$(dirname "$volume")/$link_name"
 		;;
 	  *)
-		echo "CloneSubvolume: Incompatible FS type \"$fs\" on \"$source\"!"
+		ErrorMsg "CloneSubvolume: Incompatible FS type \"$fs\" on \"$source\"!"
 		return 9
 	esac
 	return 0
@@ -194,7 +204,7 @@ RenameSubvolume() {
 			|| return 1
 		;;
 	  *)
-		echo "RenameSubvolume: Incompatible FS type \"$fs\" on \"$source\"!"
+		ErrorMsg "RenameSubvolume: Incompatible FS type \"$fs\" on \"$source\"!"
 		return 9
 	esac
 	return 0
@@ -222,7 +232,7 @@ DeleteSubvolume() {
 		[ -h "$volume" ] && rm "$volume"
 		;;
 	  *)
-		echo "DeleteSubvolume: Incompatible FS type \"$fs\" on \"$volume\"!"
+		ErrorMsg "DeleteSubvolume: Incompatible FS type \"$fs\" on \"$volume\"!"
 		return 9
 	esac
 	return 0
@@ -241,7 +251,7 @@ Initialize_Last_SysTarget_Snapshot() {
 		last=$(ls -1d "$sys_target"/[0-9]* 2>/dev/null | sort -r | head -n1)
 		if [ -n "$last" ]; then
 			if [ ! -d "$last" ]; then
-				echo "Last snapshot \"$last\" seems not to be a directory!? \"$system\" skipped!"
+				ErrorMsg "Last snapshot \"$last\" seems not to be a directory!? \"$system\" skipped!"
 				echo
 				return 1
 			fi
@@ -269,7 +279,7 @@ Initialize_Last_SysTarget_Snapshot() {
 		sys_target="$sys_target/current"
 		;;
 	  *)
-		echo "Initialize_Last_SysTarget_Snapshot: Incompatible FS type \"$fs\" on \"$sys_target\"!"
+		ErrorMsg "Initialize_Last_SysTarget_Snapshot: Incompatible FS type \"$fs\" on \"$sys_target\"!"
 		return 1
 	esac
 	return 0
@@ -293,7 +303,7 @@ if [ -r "$conf" ]; then
 else
 	config_info="${config_info} (not readable, using defaults)"
 fi
-config_info="${config_info},\nusing \"$conf_d\" as configuration directory."
+config_info="${config_info},\\nusing \"$conf_d\" as configuration directory."
 
 while [ $# -gt 0 ]; do
 	case "$1" in
@@ -318,18 +328,16 @@ while [ $# -gt 0 ]; do
 	esac
 done
 
-echo -n "Started: "; date
+echo "Started: $(date)"
 echo -e "$config_info"
 
 # Check rsync and its protocol version
-rsync=$(which "rsync" 2>/dev/null)
-if [ $? -ne 0 ]; then
-	echo "Failed to detect rsync(1)! Is it installed in your \$PATH?"
+if ! rsync=$(which "rsync" 2>/dev/null); then
+	ErrorMsg "Failed to detect rsync(1)! Is it installed in your \$PATH?"
 	exit 1
 fi
-rsync_proto=$($rsync --version 2>/dev/null | head -n 1 | sed 's/.*  protocol version \([0-9]*\)$/\1/')
-if [ $? -ne 0 ]; then
-	echo "Failed to detect protocol version of $rsync!"
+if ! rsync_proto=$($rsync --version 2>/dev/null | head -n 1 | sed 's/.*  protocol version \([0-9]*\)$/\1/'); then
+	ErrorMsg "Failed to detect protocol version of $rsync!"
 	exit 1
 fi
 echo "Rsync command is $rsync, protocol version $rsync_proto."
@@ -340,7 +348,7 @@ echo
 if [ $# -ge 1 ]; then
 	for s in "$@"; do
 		if [ ! -r "${conf_d}/$s" ]; then
-			echo "$NAME: Can' read \"${conf_d}/$s\"!"
+			ErrorMsg "$NAME: Can' read \"${conf_d}/$s\"!"
 			exit 3
 		fi
 		sys+=("${conf_d}/$s")
@@ -351,10 +359,9 @@ fi
 
 if [[ -n "$setup_exec" && $PREPOSTEXEC -ne 0 ]]; then
 	echo "Executing \"$setup_exec\" ..."
-	sh -c $setup_exec
-	if [ $? -ne 0 ]; then
-		echo "Error: setup command failed!"; echo
-		echo "Aborting backup."; echo
+	if ! sh -c $setup_exec; then
+		ErrorMsg "Error: setup command failed!"; echo
+		ErrorMsg "Aborting backup."; echo
 		exit 5
 	fi
 	sleep 2
@@ -365,16 +372,15 @@ trap GotSignal SIGINT SIGTERM
 
 # check and create PID file
 if [ -e "$PIDFILE" ]; then
-	echo "Lockfile \"$PIDFILE\" already exists."
-	echo "Is an other instance still running?"
+	ErrorMsg "Lockfile \"$PIDFILE\" already exists."
+	ErrorMsg "Is an other instance still running?"
 	echo
-	echo -n "Aborted: "; date
+	ErrorMsg "Aborted: $(date)" >&2
 	echo
 	exit 4
 fi
-touch "$PIDFILE" 2>/dev/null
-if [ $? -ne 0 ]; then
-	echo "Warning: can't create PID file \"$PIDFILE\"!"
+if ! touch "$PIDFILE" 2>/dev/null; then
+	ErrorMsg "Warning: can't create PID file \"$PIDFILE\"!"
 	echo
 else
 	echo "$$" >>"$PIDFILE"
@@ -382,11 +388,10 @@ fi
 
 if [[ -n "$pre_exec" && $PREPOSTEXEC -ne 0 ]]; then
 	echo "Executing \"$pre_exec\" ..."
-	sh -c $pre_exec
-	if [ $? -ne 0 ]; then
-		echo "Error: pre-exec command failed!"; echo
+	if ! sh -c $pre_exec; then
+		ErrorMsg "Error: pre-exec command failed!"; echo
 		CleanUp
-		echo "Aborting backup."; echo
+		ErrorMsg "Aborting backup."; echo
 		exit 5
 	fi
 	sleep 2
@@ -464,8 +469,7 @@ for f in "${sys[@]}"; do
 	[[ "$local" -eq 1 ]] && tags="$tags,LOCAL"
 	# Check tags
 	if [[ -n "$TAG" && "$TAG" != "ALL" ]]; then
-		echo "$tags" | grep -E "(^|,)$TAG(,|$)" >/dev/null 2>&1
-		if [ $? -ne 0 ]; then
+		if ! echo "$tags" | grep -E "(^|,)$TAG(,|$)" >/dev/null 2>&1; then
 			if [ "$DRYRUN" -ne 0 ]; then
 				echo "Tags of system \"$system\" don't match \"$TAG\": \"$tags\". Skipped."
 				echo
@@ -508,11 +512,11 @@ for f in "${sys[@]}"; do
 
 	# Check target directory
 	if [ -z "$target" ]; then
-		echo "No target directory specified for \"$system\"!? Skipped!"
+		ErrorMsg "No target directory specified for \"$system\"!? Skipped!"
 		echo; continue
 	fi
 	if [ ! -d "$target" ]; then
-		echo "Target \"$target\" is not a directory!? \"$system\" skipped!"
+		ErrorMsg "Target \"$target\" is not a directory!? \"$system\" skipped!"
 		echo; continue
 	fi
 
@@ -520,21 +524,20 @@ for f in "${sys[@]}"; do
 	sys_root="$sys_target"
 	if [[ "$DRYRUN" -eq 0 && ! -e "$sys_target" ]]; then
 		if [ $generations -gt 0 ]; then
-			CreateSubvolume "$sys_target"
+			CreateSubvolume "$sys_target"; r=$?
 		else
-			mkdir -p "$sys_target"
+			mkdir -p "$sys_target"; r=$?
 		fi
-		if [ $? -ne 0 ]; then
-			echo "Can't create \"$sys_target\"!? \"$system\" skipped!"
+		if [ $r -ne 0 ]; then
+			ErrorMsg "Can't create \"$sys_target\"!? \"$system\" skipped!"
 			echo; continue
 		fi
 	fi
 
 	if [[ "$local" -eq 0 && "$ping" -ne 0 ]]; then
 		# Check if system is alive
-		ping -c 1 "$system" >/dev/null 2>&1
-		if [ $? -ne 0 ]; then
-			echo "Host \"$system\" seems not to be alive!? Skipped."
+		if ! ping -c 1 "$system" >/dev/null 2>&1; then
+			ErrorMsg "Host \"$system\" seems not to be alive!? Skipped."
 			echo; continue
 		fi
 		echo "OK, host \"$system\" seems to be alive."
@@ -545,7 +548,7 @@ for f in "${sys[@]}"; do
 		if [ -e "$sys_target/.stamp" ]; then
 			# There seems to be a genearation-less backup in the
 			# target directory!
-			echo "Target directory \"$sys_target\" seems to be unclean!? \"$system\" skipped!"
+			ErrorMsg "Target directory \"$sys_target\" seems to be unclean!? \"$system\" skipped!"
 			echo; continue
 		fi
 
@@ -554,10 +557,13 @@ for f in "${sys[@]}"; do
 		if [[ -n "$last" && ! -e "$last/.stamp" ]]; then
 			# Old backup directory without "stamp file", continue
 			echo "Found incomplete snapshot in \"$last\", reusing and renaming it ..."
-			RenameSubvolume "$last" "$sys_target"
-			if [ $? -ne 0 ]; then
-				echo "Failed to rename last snapshot \"$last\" to \"$sys_target\"!? \"$system\" skipped!"
-				echo; continue
+			if [ "$DRYRUN" -eq 0 ]; then
+				if ! RenameSubvolume "$last" "$sys_target"; then
+					ErrorMsg "Failed to rename last snapshot \"$last\" to \"$sys_target\"!? \"$system\" skipped!"
+					echo; continue
+				fi
+			else
+				echo " *** Trial run, not renaming snapshot \"$last\" to \"$sys_target\"!"
 			fi
 		elif [ -n "$last" ]; then
 			# Old backup directory found, create new snapshot
@@ -565,7 +571,7 @@ for f in "${sys[@]}"; do
 			if [ "$DRYRUN" -eq 0 ]; then
 				CloneSubvolume "$last" "$sys_target" "$snapshot"; r=$?
 				if [ $r -ne 0 ]; then
-					echo "Can't create snapshot \"$snapshot\" of \"$last\", code $r!? \"$system\" skipped!"
+					ErrorMsg "Can't create snapshot \"$snapshot\" of \"$last\", code $r!? \"$system\" skipped!"
 					echo; continue
 				fi
 				echo "Created new snapshot in \"$snapshot\"."
@@ -577,7 +583,7 @@ for f in "${sys[@]}"; do
 			if [ "$DRYRUN" -eq 0 ]; then
 				CreateSubvolume "$sys_target"; r=$?
 				if [ $r -ne 0 ]; then
-					echo "Can't create subvolume \"$sys_target\", code $r!? \"$system\" skipped!"
+					ErrorMsg "Can't create subvolume \"$sys_target\", code $r!? \"$system\" skipped!"
 					echo; continue
 				fi
 				echo "Created new subvolume in \"$sys_target\"."
@@ -595,7 +601,7 @@ for f in "${sys[@]}"; do
 		ExecJob pre "$job_pre_exec" ; ret=$?
 		if [ $ret -ne 0 ]; then
 			[ $ret -ne 99 ] && count_started=$count_started+1
-			echo "Pre-exec command failed, \"$system\" skipped!"
+			ErrorMsg "Pre-exec command failed, \"$system\" skipped!"
 			echo; continue
 		fi
 	fi
@@ -646,12 +652,12 @@ for f in "${sys[@]}"; do
 			cmd="$cmd ${user}@${system}:$file $sys_target/"
 		done
 	else
-		echo "Backup type \"$backup_type\" undefined, \"$system\" skipped!"
+		ErrorMsg "Backup type \"$backup_type\" undefined, \"$system\" skipped!"
 		echo; continue
 	fi
 
 	echo "Backing up to \"$sys_target\" ..."
-	echo -n "Start date: "; date
+	echo "Start date: $(date)"
 	echo "$cmd"
 	count_started=$count_started+1
 	ok=0
@@ -679,11 +685,11 @@ for f in "${sys[@]}"; do
 	fi
 
 	if [ $ret -eq 20 ]; then
-		echo "Backup of \"$system\" interrupted. Aborting ..."
+		ErrorMsg "Backup of \"$system\" interrupted. Aborting ..."
 		GotSignal
 	fi
 
-	echo -n "End date: "; date
+	echo "End date: $(date)"
 	if [[ $ret -eq 0 || $ret -eq 24 ]]; then
 		[ $ret -eq 24 ] && count_ok_vanished=$count_ok_vanished+1
 
@@ -691,7 +697,7 @@ for f in "${sys[@]}"; do
 		[ "$DRYRUN" -gt 0 ] || count_ok=$count_ok+1
 		ok=1
 	else
-		echo "System \"$system\" completed with ERRORS, code $ret!"
+		ErrorMsg "System \"$system\" completed with ERRORS, code $ret!"
 	fi
 
 	# execute job "post-exec" command, if any
@@ -716,7 +722,7 @@ for f in "${sys[@]}"; do
 			for delete in $to_delete; do
 				dir="$sys_root/$delete"
 				if [ ! -e "$dir/.stamp" ]; then
-					echo "Not deleting \"$dir\", not a backup directory!?"
+					ErrorMsg "Not deleting \"$dir\" of \"$system\", not a backup directory!?"
 					continue
 				fi
 				last=$(stat "$dir/.stamp" 2>/dev/null | grep "^Modify: " \
@@ -724,14 +730,13 @@ for f in "${sys[@]}"; do
 				# shellcheck disable=SC2086
 				echo "Removing backup from" $last "..."
 				if [ "$DRYRUN" -eq 0 ]; then
-					DeleteSubvolume "$dir"
-					[ $? -eq 0 ] || \
-					  echo "Failed to delete \"$dir\"!"
+					DeleteSubvolume "$dir" \
+						|| ErrorMsg "Failed to delete \"$dir\" of \"$system\"!"
 				fi
 			done
-			echo -n "Clean up finished: "; date
+			echo "Clean up finished: $(date)"
 		elif [ -n "$to_delete" ]; then
-			echo "There have been errors, not cleaning up old generations!"
+			ErrorMsg "There have been errors for \"$system\", not cleaning up old generations!"
 		else
 			echo "Nothing to clean up (keep up to $generations generations)."
 		fi
@@ -771,7 +776,7 @@ fi
 
 CleanUp
 
-echo -n "Done: "; date
+echo "Done: $(date)"
 echo
 [ $count_all -eq 1 ] && s="" || s="s"
 [ $count_enabled -eq $count_all ] \