Add an explicit exit 0 to the end of the script.

The implicit return is "$?", which can be set non-zero by an earlier command.
Add -q to the getopt list of short options.
2025-08-18 08:29:58 +02:00 · 2011-11-21 21:44:37 -06:00 · 2011-11-21 21:40:04 -06:00 · 2011-11-21 20:40:24 -06:00
8 changed files with 7 additions and 37 deletions
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +0,0 @@
-zfs-auto-snapshot (1.0.0) oneiric; urgency=low
-
-  * Initial release.
-  * Initial debian packaging.
-
- -- Darik Horn <dajhorn@vanadac.com>  Mon, 21 Nov 2011 20:01:19 -0600
--- a/debian/compat
+++ b/debian/compat
@@ -1 +0,0 @@
-7
--- a/debian/control
+++ b/debian/control
@@ -1,16 +0,0 @@
-Source: zfs-auto-snapshot
-Section: admin
-Priority: extra
-Maintainer: Darik Horn <dajhorn@vanadac.com>
-Build-Depends: debhelper (>= 7.4)
-Standards-Version: 3.8.4
-Homepage: http://www.zfsonlinux.org/
-Vcs-Git: git://github.com/dajhorn/zfs-auto-snapshot.git
-Vcs-Browser: https://github.com/dajhorn/zfs-auto-snapshot/
-
-Package: zfs-auto-snapshot
-Architecture: all
-Depends: ${misc:Depends}, cron, zfsutils
-Description: ZFS Automatic Snapshot Service
- Automatically create and destroy ZFS snapshots on an hourly, daily, weekly
- and monthly schedule.
--- a/debian/copyright
+++ b/debian/copyright
@@ -1 +0,0 @@
-Copyright 2011 Darik Horn <dajhorn@vanadac.com>
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +0,0 @@
-#!/usr/bin/make -f
-
-%:
-	dh $@
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +0,0 @@
-version=3
-http://githubredir.debian.net/github/dajhorn/zfs-auto-snapshot/([\d\.].*).tar.gz
--- a/etc/zfs-auto-snapshot.cron
+++ b/etc/zfs-auto-snapshot.cron
@@ -1,8 +1,7 @@
 PATH="/usr/bin:/bin:/usr/sbin:/sbin"
-OPTIONS="--quiet --syslog"

-* */4 * * * root zfs-auto-snapshot $OPTIONS --label=frequent --keep=4  //
-@hourly     root zfs-auto-snapshot $OPTIONS --label=hourly   --keep=24 //
-@daily      root zfs-auto-snapshot $OPTIONS --label=daily    --keep=31 //
-@weekly     root zfs-auto-snapshot $OPTIONS --label=weekly   --keep=4  //
-@monthly    root zfs-auto-snapshot $OPTIONS --label=monthly  --keep=12 //
+*/15 * * * * root zfs-auto-snapshot -q -g --label=frequent --keep=4  //
+@hourly      root zfs-auto-snapshot -q -g --label=hourly   --keep=24 //
+@daily       root zfs-auto-snapshot -q -g --label=daily    --keep=31 //
+@weekly      root zfs-auto-snapshot -q -g --label=weekly   --keep=4  //
+@monthly     root zfs-auto-snapshot -q -g --label=monthly  --keep=12 //
--- a/src/zfs-auto-snapshot.sh
+++ b/src/zfs-auto-snapshot.sh
@@ -136,7 +136,7 @@ GETOPT=$(getopt \
  --longoptions=default-exclude,dry-run,skip-scrub,recursive \
  --longoptions=keep:,label:,prefix:,sep: \
  --longoptions=debug,help,quiet,syslog,verbose \
-  --options=dnshl:k:rs:gv \
+  --options=dnshl:k:rs:qgv \
  -- "$@" ) \
  || exit 1

@@ -508,4 +508,5 @@ done
 print_log notice "@$SNAPSHOT_NAME, \
 $SNAPSHOT_COUNT created, $DESTRUCTION_COUNT destroyed, $WARNING_COUNT warnings."

+exit 0
 # }
Author	SHA1	Message	Date
Darik Horn	d8b1730015	Add an explicit `exit 0` to the end of the script. The implicit return is "$?", which can be set non-zero by an earlier command.	2011-11-21 21:44:37 -06:00
Darik Horn	adebbd6fee	Add -q to the getopt list of short options. This corresponds to the --quiet option.	2011-11-21 21:40:04 -06:00
Darik Horn	5bdcaad4bf	Expand the options variable in the cron part file. Cron doesn't do variable substitution and zfs-auto-snapshot doesn't load options from its environment.	2011-11-21 20:40:24 -06:00
				`@@ -1 +0,0 @@`
				`Copyright 2011 Darik Horn <dajhorn@vanadac.com>`