From 4cdfb0c0ed438f4fa5508172d16c31d1ae135a8e Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 1 Sep 2021 11:56:41 +0300
Subject: [PATCH] Various zsnap fixes

---
 bin/bin/zsnap.zsh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/bin/bin/zsnap.zsh b/bin/bin/zsnap.zsh
index f9f9702..0182a53 100755
--- a/bin/bin/zsnap.zsh
+++ b/bin/bin/zsnap.zsh
@@ -1,6 +1,7 @@
 #!/usr/bin/env zsh
 
 set -e
+setopt EXTENDED_GLOB
 
 usage() {
     cat <<EOF
@@ -13,7 +14,7 @@ EOF
     exit 1
 }
 
-enccmd="/home/stargrave/bin/gpg-e-fast.sh --recipient offline"
+enccmd=(~stargrave/bin/gpg-e-fast.sh --recipient offline)
 
 [[ $# -ge 2 ]] || usage
 
@@ -21,7 +22,7 @@ what=$1
 action=$2
 
 now=$(date "+%Y%m%d%H%M")
-depth=${#${(s./.)what}}
+[[ $what =~ / ]] && depth=1 || depth=${#${(s./.)what}}
 snaps=$(zfs list -t snap -d $depth -o name -H | grep $what | sort -nr)
 snaps=(${(f)snaps})
 latest=${snaps[1]}
@@ -42,22 +43,23 @@ case $action in
         dst=$3
         [[ -d $dst ]] || usage
         setopt PIPE_FAIL
-        zfs send -Rv $latest | zstd | ${=enccmd} > \
-            $dst/$latest_filename.zfs.zst.gpg
+        zfs send -Rv $latest | zstd | $enccmd > $dst/$latest_filename.zfs.zst.gpg
         sync
         touch $dst/$latest_filename.from
         ;;
     sync)
         dst=$3
         [[ -d $dst ]] || usage
-        latest_dst=($dst/*(.Onn[1]))
+        latest_dst=($dst/*~$dst/.*(.L0Onn[1]))
         [[ $latest_dst ]]
         latest_dst=${latest_dst[1]}
         latest_dst=${${latest_dst##*/}%.from}
         [[ $latest_dst != $latest_filename ]]
         setopt PIPE_FAIL
-        zfs send -Rv -i ${latest_dst:gs#%#/} $latest | zstd | ${=enccmd} > \
+        set -x
+        zfs send -Rv -i ${latest_dst:gs#%#/} $latest | zstd | $enccmd > \
             $dst/$latest_filename.zfs.zst.gpg
+        set +x
         sync
         print $latest_dst > $dst/$latest_filename.from
         ;;
-- 
2.44.0