From 543dbbad5319b40a9c8e8748da2d5c8f3788f632 Mon Sep 17 00:00:00 2001
From: Joseph Mingrone <jrm@ftfl.ca>
Date: Wed, 24 Aug 2016 00:15:07 -0300
Subject: [PATCH] Always create snapshots

Prior to this commit, zap would only create new snapshots for filesystem
that had changed since the last snapshot.  If there were no changes,
then the name of the most recent snapshot would be updated with the
current date.  There were problems with this logic, so just
unconditionally create the snapshot.
---
 README.org |  8 ++------
 zap        | 21 +++------------------
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/README.org b/README.org
index d29fd6b..d1d2c06 100644
--- a/README.org
+++ b/README.org
@@ -7,7 +7,7 @@
 *** Key features
     - no configuration files
     - uses "namespaces" to avoid collisions with other snapshots
-    - creates and destroys snapshots only when it makes sense [2][3]
+    - creates and destroys snapshots only when it makes sense [2]
     - written in POSIX sh
 
 ** Synopsis
@@ -80,8 +80,4 @@ SHELL=/bin/sh
 [1] zap was influenced by zfSnap, which is under a BEER-WARE license.
 We owe the author a beer.
 
-[2] New snapshots are only created when a filesystem has changed since the last
-snapshot.  If the filesystem has not changed, then the timestamp of the newest
-snapshot is updated.
-
-[3] If the pool is in a DEGRADED state, zap will not destroy snapshots.
\ No newline at end of file
+[2] If the pool is in a DEGRADED state, zap will not destroy snapshots.
\ No newline at end of file
diff --git a/zap b/zap
index fe1f486..bd788d0 100755
--- a/zap
+++ b/zap
@@ -41,11 +41,7 @@
 # [1] zap was influenced by zfSnap, which is under a BEER-WARE license.  We owe
 # the authors a beer.
 #
-# [2] New snapshots are only created when a filesystem has changed since the
-# last snapshot.  If the filesystem has not changed, then the timestamp of the
-# newest snapshot is updated.
-#
-# [3] If the pool is in a DEGRADED state, zap will not destroy snapshots.
+# [2] If the pool is in a DEGRADED state, zap will not destroy snapshots.
 #
 
 fatal () {
@@ -54,7 +50,7 @@ fatal () {
 }
 
 help () {
-    readonly version=0.3.0
+    readonly version=0.4.0
 
     cat <<EOF
 NAME
@@ -145,18 +141,7 @@ create () {
                 grep -q "FAULTED\|OFFLINE\|REMOVED\|UNAVAIL"; then
             warn "zap skipped creating a snapshot for $i because of pool state!"
         else
-            r=$(zfs list -rHo name -t snap -S name "$i" | grep "${i}${zptn}" | \
-                    grep -e "--${ttl}" -m1)
-            if [ ! -z "$r" ]; then
-                s=$(zfs get -H -o value written "$r")
-                if [ "${s}" != "0" ]; then
-                    zfs snapshot "${i}@ZAP_${date}--${ttl}"
-                else
-                    zfs rename "${r}" "${i}@ZAP_${date}--${ttl}"
-                fi
-            else
-                zfs snapshot "${i}@ZAP_${date}--${ttl}"
-            fi
+            zfs snapshot "${i}@ZAP_${date}--${ttl}"
         fi
     done
 }