Resolve sorted files before use. Fail on error (and avoid diffs being treated as errors).

1 files changed, 4 insertions, 3 deletions

diff --git a/savelocaltweaks b/savelocaltweaks
index a4750ae..4f0bec5 100755
--- a/savelocaltweaks
+++ b/savelocaltweaks
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-#set -e
+set -e
 
 basedir="/etc"
 targetdir="$(mktemp -td localtweaks.XXXXXX)"
@@ -33,7 +33,8 @@ if [ -d "$(dirname "$excludefile")" ] && [ -r "$excludefile" ]; then
 fi
 
 # process all files once each
-for file in $(for x in $files; do echo $x; done | uniq | sort); do
+files="$(for x in $files; do echo $x; done | uniq | sort)"
+for file in $files; do
 
 	# file were chosen based on backups - it may not exist itelf
 	[ -s "$basedir/$file" ] || continue
@@ -56,7 +57,7 @@ for file in $(for x in $files; do echo $x; done | uniq | sort); do
 
 	# Only diff against existing and non-empty files.
 	if [ -n "$ext" ] && [ -s "$basedir/$file$ext" ]; then
-		diff -ruN "$basedir/$file$ext" "$basedir/$file" > "$targetdir/$basedir/$file.diff"
+		diff -ruN "$basedir/$file$ext" "$basedir/$file" > "$targetdir/$basedir/$file.diff" || [ $? -lt 2 ]
 		chown --reference="$basedir/$file" "$targetdir/$basedir/$file.diff"
 		chmod --reference="$basedir/$file" "$targetdir/$basedir/$file.diff"
 		chmod a-x "$targetdir/$basedir/$file.diff"