Further cron logic cleanups

highvoltage · highvoltage · commit 277287f8241b · 2017-09-18T09:25:02.000+02:00
diff --git a/etc/zfs-auto-snapshot.cron.daily b/etc/zfs-auto-snapshot.cron.daily
@@ -1,5 +1,6 @@
 #!/bin/sh
 
 # Only call zfs-auto-snapshot if it's available
-which zfs-auto-snapshot > /dev/null && \
-     exec zfs-auto-snapshot --quiet --syslog --label=daily --keep=31 //
+which zfs-auto-snapshot > /dev/null || exit 0
+
+exec zfs-auto-snapshot --quiet --syslog --label=daily --keep=31 //
diff --git a/etc/zfs-auto-snapshot.cron.frequent b/etc/zfs-auto-snapshot.cron.frequent
@@ -1,3 +1,3 @@
 PATH="/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"
 
-*/15 * * * * root which zfs-auto-snapshot > /dev/null && zfs-auto-snapshot --quiet --syslog --label=frequent --keep=4  //
+*/15 * * * * root which zfs-auto-snapshot > /dev/null || exit 0 ; zfs-auto-snapshot --quiet --syslog --label=frequent --keep=4 //
diff --git a/etc/zfs-auto-snapshot.cron.hourly b/etc/zfs-auto-snapshot.cron.hourly
@@ -1,5 +1,6 @@
 #!/bin/sh
 
 # Only call zfs-auto-snapshot if it's available
-which zfs-auto-snapshot > /dev/null && \
-     exec zfs-auto-snapshot --quiet --syslog --label=hourly --keep=24 //
+which zfs-auto-snapshot > /dev/null || exit 0
+
+exec zfs-auto-snapshot --quiet --syslog --label=hourly --keep=24 //
diff --git a/etc/zfs-auto-snapshot.cron.monthly b/etc/zfs-auto-snapshot.cron.monthly
@@ -1,5 +1,6 @@
 #!/bin/sh
 
 # Only call zfs-auto-snapshot if it's available
-which zfs-auto-snapshot > /dev/null && \
-     exec zfs-auto-snapshot --quiet --syslog --label=monthly --keep=12 //
+which zfs-auto-snapshot > /dev/null || exit 0
+
+exec zfs-auto-snapshot --quiet --syslog --label=monthly --keep=12 //
diff --git a/etc/zfs-auto-snapshot.cron.weekly b/etc/zfs-auto-snapshot.cron.weekly
@@ -1,5 +1,6 @@
 #!/bin/sh
 
 # Only call zfs-auto-snapshot if it's available
-which zfs-auto-snapshot > /dev/null && \
-     exec zfs-auto-snapshot --quiet --syslog --label=weekly --keep=8 //
+which zfs-auto-snapshot > /dev/null || exit 0
+
+exec zfs-auto-snapshot --quiet --syslog --label=weekly --keep=8 //

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`PATH="/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"`
`2`	`2`
`3`		`-/15 * * * root which zfs-auto-snapshot > /dev/null && zfs-auto-snapshot --quiet --syslog --label=frequent --keep=4 //`
	`3`	`+/15 * * * root which zfs-auto-snapshot > /dev/null \|\| exit 0 ; zfs-auto-snapshot --quiet --syslog --label=frequent --keep=4 //`