]> Cypherpunks.ru repositories - prepro.git/commitdiff
Trivial style fixes
authorSergey Matveev <stargrave@stargrave.org>
Sun, 18 Feb 2024 18:44:05 +0000 (21:44 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Sun, 18 Feb 2024 19:17:46 +0000 (22:17 +0300)
list-vers
mk-html
mk-htmls
mk-list
mk-mod
mk-mods

index e9a5358858a0fb2b3003a8d677806ae32c9b5f47731f019c5bb45ef16fc90930..e551e8ad075cf3098d663dde58f60741ed3e07b39b005cc94f5d8ce475d00998 100755 (executable)
--- a/list-vers
+++ b/list-vers
@@ -1,6 +1,6 @@
 #!/usr/bin/env zsh
 
-set -e
+setopt ERR_EXIT
 vcs=$1
 mod=$2
 cd $vcs
diff --git a/mk-html b/mk-html
index 850103ed3d54eb81ee81b8c3487449092cced9b01d825b179c8f4ed0f7725c3a..4c472a86951cd341f1a2eab29f338616c2645feeb039d8fd8c7d6222eb52a3f4 100755 (executable)
--- a/mk-html
+++ b/mk-html
@@ -1,6 +1,6 @@
 #!/usr/bin/env zsh
 
-set -e
+setopt ERR_EXIT
 
 vcsurl=$1
 modname=$2
@@ -9,7 +9,7 @@ cols=(${(s#/#)modname})
 [[ ${cols[-1]} =~ v[0-9]+ ]] || cols=($cols v1)
 moddir=${(j:/:)cols[1,-2]}
 v=${cols[-1]}
-[[ -s $moddir/$v ]] && exit
+[[ ! -s $moddir/$v ]] || exit 0
 mkdir -p $moddir
 cat > $moddir/$v <<EOF
 <!DOCTYPE html>
index 93a3866432048732f782180c63abedc2d533381704440b9fbc4b01358067710a..fd763aa56ee339332ee080d899953c1664e1f6ee235c75cb742dc65bfb5bd511 100755 (executable)
--- a/mk-htmls
+++ b/mk-htmls
@@ -1,6 +1,6 @@
 #!/usr/bin/env zsh
 
-set -e
+setopt ERR_EXIT
 root=$0:h:a
 vcsurl=$1
 vcspath=$2
diff --git a/mk-list b/mk-list
index 67cbc44a5508e4b590824a75c18a2db3ce3d735e0fc7cb954d0c5a17bb27a223..fcf0cad440bd6f4538c91a7fb7448268bbb0f1aa962fdc5c443a76d0e4fad424 100755 (executable)
--- a/mk-list
+++ b/mk-list
@@ -1,7 +1,6 @@
 #!/usr/bin/env zsh
 
-set -e
-setopt EXTENDED_GLOB
+setopt ERR_EXIT EXTENDED_GLOB
 for d (**/*(/)) {
     list=()
     for f ($d/*.info(onN)) list=($list $f:t:r)
diff --git a/mk-mod b/mk-mod
index 1d9332ab197aeecf24e3a1829ef7daa0f8ed5929988da00d4a5a2c0d26fe4290..6fb58f6951c81a767bbd8677cf20f4ab4c5ba4950f0bc37998106b96dcf5ced3 100755 (executable)
--- a/mk-mod
+++ b/mk-mod
@@ -1,6 +1,6 @@
 #!/usr/bin/env zsh
 
-set -e
+setopt ERR_EXIT
 
 vcsurl=$1
 vcspath=$2
@@ -11,15 +11,15 @@ signkey=$5
 dst=$modname/@v
 mkdir -p $dst
 cd $dst
-[[ -s $version.zip ]] && exit
+[[ ! -s $version.zip ]] || exit 0
 
 root=$0:h:a
 zipcreate=$root/zip-create
 ziphash=$root/zip-hash
 zmodload -F zsh/datetime b:strftime
 git -C $vcspath cat-file -p $version | while read line ; do
-    [[ $line =~ ^object ]] && hsh=${${=line}[-1]}
-    [[ $line =~ ^tagger ]] && {
+    [[ ! $line =~ ^object ]] || hsh=${${=line}[-1]}
+    [[ ! $line =~ ^tagger ]] || {
         strftime -s sec -r "%s %z" "${${=line}[-2,-1]}"
         break
     }
diff --git a/mk-mods b/mk-mods
index dc721760d7b6dd65b2b0e25ca7f589c3a45e61a3968247f9816c0b57fbf1009c..8f565116465249605a8975aacd2089b35f22588aa2262a572942c9f9364a5f0a 100755 (executable)
--- a/mk-mods
+++ b/mk-mods
@@ -1,6 +1,6 @@
 #!/usr/bin/env zsh
 
-set -e
+setopt ERR_EXIT
 root=$0:h:a
 vcsurl=$1
 vcspath=$2