AVOID_DAILY_AUTOCOMMITS only disables the cron job

The systemd timer can be disabled by running systemctl, so it's redundant
to have another way to disable it. And, users will want to disable the cron
job when enabling the timer.

1 files changed, 10 insertions, 13 deletions

diff --git a/daily b/daily
index d35191a..f98c6ad 100755
--- a/daily
+++ b/daily
@@ -2,19 +2,16 @@
 # Script that can be run daily to autocommit /etc changes.
 set -e
 if [ -x /usr/bin/etckeeper ] && [ -e /etc/etckeeper/etckeeper.conf ]; then
-	. /etc/etckeeper/etckeeper.conf
-	if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then
-		# avoid autocommit if an install run is in progress
-		lockfile=/var/cache/etckeeper/packagelist.pre-install
-		if [ -e "$lockfile" ] && [ -n "$(find "$lockfile" -mtime +1)" ]; then
-			rm -f "$lockfile" # stale
-		fi
-		if [ ! -e "$lockfile" ]; then
-			AVOID_SPECIAL_FILE_WARNING=1
-			export AVOID_SPECIAL_FILE_WARNING
-			if etckeeper unclean; then
-				etckeeper commit "daily autocommit" >/dev/null
-			fi
+	# avoid autocommit if an install run is in progress
+	lockfile=/var/cache/etckeeper/packagelist.pre-install
+	if [ -e "$lockfile" ] && [ -n "$(find "$lockfile" -mtime +1)" ]; then
+		rm -f "$lockfile" # stale
+	fi
+	if [ ! -e "$lockfile" ]; then
+		AVOID_SPECIAL_FILE_WARNING=1
+		export AVOID_SPECIAL_FILE_WARNING
+		if etckeeper unclean; then
+			etckeeper commit "daily autocommit" >/dev/null
 		fi
 	fi
 fi