From b90a8671dd5879e07e8854546ec0fa53dc42efb7 Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 18 Feb 2024 22:33:35 +0300
Subject: [PATCH] Trivial style fixes

---
 bin/bin/music-indexer                                | 6 +++---
 bin/bin/my-ps2pdf                                    | 2 +-
 bin/bin/zsnap                                        | 3 +--
 img/bin/my-jxll                                      | 2 +-
 mkv/bin/my-mkvmerge                                  | 2 +-
 nnn/bin/_nnn-cd                                      | 2 +-
 nnn/bin/_nnn-cp                                      | 2 +-
 tmux/.tmux/bin/fzf.zsh                               | 2 +-
 vim/.vim/pack/stargrave/start/zshfe/plugin/zshfe.zsh | 2 +-
 9 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/bin/bin/music-indexer b/bin/bin/music-indexer
index 02e3823..a1e837e 100755
--- a/bin/bin/music-indexer
+++ b/bin/bin/music-indexer
@@ -29,12 +29,12 @@ for name (*~cols) {
         album=(${ts[2,-1]})
     }
     lossless=""
-    [[ -d $name ]] && {
+    if [[ -d $name ]] ; then
         wvs=($name/**/*.wv(N))
         [[ ${#wvs} -gt 0 ]] && lossless=1
-    } || {
+    else
         [[ $name:e = wv ]] && lossless=1
-    }
+    fi
     cols=()
     for col ($COLS) [[ -e cols/$col/$name ]] && cols=($cols $col)
 
diff --git a/bin/bin/my-ps2pdf b/bin/bin/my-ps2pdf
index ba5af64..5510c18 100755
--- a/bin/bin/my-ps2pdf
+++ b/bin/bin/my-ps2pdf
@@ -5,7 +5,7 @@
 # removes all empty metainformation fields, removed fields
 # with uuid:s, removes Format (that is application/pdf).
 
-set -e
+setopt ERR_EXIT
 opts=(
     -dQUIET
     -dBATCH
diff --git a/bin/bin/zsnap b/bin/bin/zsnap
index 90d08f6..7bab829 100755
--- a/bin/bin/zsnap
+++ b/bin/bin/zsnap
@@ -1,7 +1,6 @@
 #!/usr/bin/env zsh
 
-set -e
-setopt EXTENDED_GLOB
+setopt ERR_EXIT EXTENDED_GLOB
 
 usage() {
     cat <<EOF
diff --git a/img/bin/my-jxll b/img/bin/my-jxll
index 3515f4c..cd6ee12 100755
--- a/img/bin/my-jxll
+++ b/img/bin/my-jxll
@@ -1,6 +1,6 @@
 #!/usr/bin/env zsh
 
-set -e
+setopt ERR_EXIT
 tmp=`mktemp`
 trap "rm -f $tmp.pnm $tmp.jxl" HUP PIPE INT QUIT TERM EXIT
 case $1:e in
diff --git a/mkv/bin/my-mkvmerge b/mkv/bin/my-mkvmerge
index 471898d..5bf907f 100755
--- a/mkv/bin/my-mkvmerge
+++ b/mkv/bin/my-mkvmerge
@@ -1,6 +1,6 @@
 #!/usr/bin/env zsh
 
-set -e
+setopt ERR_EXIT
 zparseopts -D -A info url: descr: out:
 tags=`mktemp`
 trap "rm -f $tags" HUP PIPE INT QUIT TERM EXIT
diff --git a/nnn/bin/_nnn-cd b/nnn/bin/_nnn-cd
index 042efe7..5ee8075 100755
--- a/nnn/bin/_nnn-cd
+++ b/nnn/bin/_nnn-cd
@@ -1,6 +1,6 @@
 #!/usr/bin/env zsh
 
-set -e
+setopt ERR_EXIT
 [[ -n "$NNN_PIPE" ]]
 autoload ~/.zsh/functions/cf
 cf $1
diff --git a/nnn/bin/_nnn-cp b/nnn/bin/_nnn-cp
index 8a8a395..86f424c 100755
--- a/nnn/bin/_nnn-cp
+++ b/nnn/bin/_nnn-cp
@@ -1,6 +1,6 @@
 #!/usr/bin/env zsh
 
-set -e
+setopt ERR_EXIT
 sel=${NNN_SEL:-${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.selection}
 [[ -s $sel ]]
 tgts=$(xargs -0 -L1 < $sel)
diff --git a/tmux/.tmux/bin/fzf.zsh b/tmux/.tmux/bin/fzf.zsh
index 8872926..06c91d5 100755
--- a/tmux/.tmux/bin/fzf.zsh
+++ b/tmux/.tmux/bin/fzf.zsh
@@ -1,7 +1,7 @@
 #!/usr/bin/env zsh
 
 cd $2
-set -e
+setopt ERR_EXIT
 fpath=(~/.tmux/functions.zsh $fpath)
 autoload tmux-fzf-$1
 tmp=`mktemp`
diff --git a/vim/.vim/pack/stargrave/start/zshfe/plugin/zshfe.zsh b/vim/.vim/pack/stargrave/start/zshfe/plugin/zshfe.zsh
index 1afcb2a..9222054 100755
--- a/vim/.vim/pack/stargrave/start/zshfe/plugin/zshfe.zsh
+++ b/vim/.vim/pack/stargrave/start/zshfe/plugin/zshfe.zsh
@@ -1,6 +1,6 @@
 #!/usr/bin/env zsh
 
-set -e
+setopt ERR_EXIT
 zmodload zsh/zpty
 zpty zshfe zsh
 zpty -w zshfe "print ZSHFE $*"$'\t EFHSZ\nexit\n'
-- 
2.44.0