Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow specifying UTC vs local timezone as program argument #77

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/zfs-auto-snapshot.8
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ LAB is usually 'hourly', 'daily', or 'monthly'.
\fB\-p\fR, \fB\-\-prefix\fR=\fIPRE\fR
PRE is 'zfs\-auto\-snap' by default.
.TP
\fB\-\-local\-tz\fR
Use system's local timezone instead of UTC in snapshot names.
.TP
\fB\-q\fR, \fB\-\-quiet\fR
Suppress warnings and notices at the console.
.TP
Expand Down
17 changes: 15 additions & 2 deletions src/zfs-auto-snapshot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ print_usage ()
-k, --keep=NUM Keep NUM recent snapshots and destroy older snapshots.
-l, --label=LAB LAB is usually 'hourly', 'daily', or 'monthly'.
-p, --prefix=PRE PRE is 'zfs-auto-snap' by default.
--local-tz Use system's local timezone instead of UTC in snapshot
names.
-q, --quiet Suppress warnings and notices at the console.
--send-full=F Send zfs full backup. Unimplemented.
--send-incr=F Send zfs incremental backup. Unimplemented.
Expand Down Expand Up @@ -209,7 +211,7 @@ do_snapshots () # properties, flags, snapname, oldglob, [targets...]

GETOPT=$(getopt \
--longoptions=default-exclude,dry-run,fast,skip-scrub,recursive \
--longoptions=event:,keep:,label:,prefix:,sep: \
--longoptions=event:,keep:,label:,prefix:,local-tz:,sep: \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The : after local-tz needs to be removed because this option doesn't take an argument. I'd also suggest moving it down in to the next line.

--longoptions=debug,help,quiet,syslog,verbose \
--longoptions=pre-snapshot:,post-snapshot:,destroy-only \
--options=dnshe:l:k:p:rs:qgv \
Expand Down Expand Up @@ -286,6 +288,10 @@ do
opt_prefix="$2"
shift 2
;;
(--local-tz)
opt_local_tz='1'
shift 1
;;
(-q|--quiet)
opt_debug=''
opt_quiet='1'
Expand Down Expand Up @@ -534,7 +540,14 @@ SNAPPROP="-o com.sun:auto-snapshot-desc='$opt_event'"

# ISO style date; fifteen characters: YYYY-MM-DD-HHMM
# On Solaris %H%M expands to 12h34.
DATE=$(date --utc +%F-%H%M)
# If the --local-tz flag is set use the system's timezone.
# Otherwise, the default is to use UTC.
if [ -n $"opt_local_tz" ]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The $ should be moved inside the quotes.

then
DATE=$(date +%F-%H%M)
else
DATE=$(date --utc +%F-%H%M)
fi

# The snapshot name after the @ symbol.
SNAPNAME="$opt_prefix${opt_label:+$opt_sep$opt_label}-$DATE"
Expand Down