From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 18 Feb 2024 19:27:17 +0000 (+0300)
Subject: Trivial style fixes
X-Git-Url: http://www.git.stargrave.org/?p=feeder.git;a=commitdiff_plain;h=HEAD

Trivial style fixes
---

diff --git a/cmd/clear b/cmd/clear
index 63eb946..7cf8ad3 100755
--- a/cmd/clear
+++ b/cmd/clear
@@ -1,8 +1,7 @@
 #!/usr/bin/env zsh
-set -e
+setopt ERR_EXIT EXTENDED_GLOB
 cmds=$0:h:a
 . $cmds/env.rc
-setopt EXTENDED_GLOB
 [[ -s $1/max ]] && max=`cat $1/max` || max=$FEEDER_MAX_ITEMS
 (( max++ ))
 [[ $max -eq 1 ]] || rm -fv $1/cur/*(Nom[$max,-1])
diff --git a/cmd/do-in-parallel b/cmd/do-in-parallel
index 3221422..dc14114 100755
--- a/cmd/do-in-parallel
+++ b/cmd/do-in-parallel
@@ -1,5 +1,5 @@
 #!/usr/bin/env zsh
-set -e
+setopt ERR_EXIT
 cmds=$0:h:a
 . $cmds/env.rc
 log=$1.log
diff --git a/cmd/encs b/cmd/encs
index a364266..d16ab5e 100755
--- a/cmd/encs
+++ b/cmd/encs
@@ -1,22 +1,21 @@
 #!/usr/bin/env zsh
-set -e
+setopt ERR_EXIT EXTENDED_GLOB
 cmds=$0:h:a
 . $cmds/env.rc
 fpath=($cmds/functions.zsh $fpath)
 dst=$2:a
 cd $1
-[[ -n "$dst" ]] || { dst=encs ; dst=$dst:a }
+[[ -n $dst ]] || { dst=encs ; dst=$dst:a }
 mkdir -p $dst
 autoload url-to-filename
 zmodload -F zsh/datetime b:strftime
-setopt EXTENDED_GLOB
 for new (new/*(N)) {
     while read line ; do
-        [[ "$line" != "" ]] || break
+        [[ -n $line ]] || break
         cols=(${(s: :)line})
         [[ $cols[1] = "X-Enclosure:" ]] || continue
         url=$cols[2]
-        [[ -n "$url" ]]
+        [[ -n $url ]]
         fn=$(strftime %Y%m%d-%H%M%S)-$(url-to-filename $url)
         ${=WGET} --user-agent=$FEEDER_USER_AGENT \
             --output-document=$dst/$fn $url 2>&2 2>encs.log
diff --git a/cmd/warcs b/cmd/warcs
index 2f662ab..7934b63 100755
--- a/cmd/warcs
+++ b/cmd/warcs
@@ -1,15 +1,14 @@
 #!/usr/bin/env zsh
-set -e
+setopt ERR_EXIT EXTENDED_GLOB
 cmds=$0:h:a
 . $cmds/env.rc
 fpath=($cmds/functions.zsh $fpath)
 dst=$2:a
 cd $1
-[[ -n "$dst" ]] || { dst=warcs ; dst=$dst:a }
+[[ -n $dst ]] || { dst=warcs ; dst=$dst:a }
 mkdir -p $dst
 autoload url-to-filename
 zmodload -F zsh/datetime b:strftime
-setopt EXTENDED_GLOB
 wget_opts=(
     --user-agent="$FEEDER_USER_AGENT"
     --page-requisites
@@ -20,7 +19,7 @@ wget_opts=(
 )
 for new (new/*(N)) {
     while read line ; do
-        [[ "$line" != "" ]] || break
+        [[ -n $line ]] || break
         cols=(${(s: :)line})
         [[ $cols[1] = "X-URL:" ]] || continue
         url=$cols[2]
diff --git a/contrib/feeds-oldenize.zsh b/contrib/feeds-oldenize.zsh
index 0cc7f69..33b3586 100755
--- a/contrib/feeds-oldenize.zsh
+++ b/contrib/feeds-oldenize.zsh
@@ -1,6 +1,5 @@
 #!/usr/bin/env zsh
-set -e
-setopt EXTENDED_GLOB
+setopt ERR_EXIT EXTENDED_GLOB
 for i (**/new) {
     pushd $i
     for m (*(N)) mv -v $m ../cur/"$m":2,S
diff --git a/feeds-clear b/feeds-clear
index 62e73f2..9329d67 100755
--- a/feeds-clear
+++ b/feeds-clear
@@ -1,4 +1,4 @@
 #!/usr/bin/env zsh
-set -e
+setopt ERR_EXIT
 cmds=$0:h:a/cmd
 for f (feeds/*) $cmds/clear $f
diff --git a/feeds-news b/feeds-news
index 3d45202..0f49d3f 100755
--- a/feeds-news
+++ b/feeds-news
@@ -1,6 +1,5 @@
 #!/usr/bin/env zsh
-set -e
-setopt EXTENDED_GLOB
+setopt ERR_EXIT EXTENDED_GLOB
 for f (feeds/*(/on)) {
     news=($f/new/*(N))
     [[ $#news -eq 0 ]] || print "$f:t": $#news
diff --git a/urls2feeds b/urls2feeds
index 486ba82..90b1341 100755
--- a/urls2feeds
+++ b/urls2feeds
@@ -1,5 +1,5 @@
 #!/usr/bin/env zsh
-set -e
+setopt ERR_EXIT
 fpath=($0:h:a/cmd/functions.zsh $fpath)
 autoload url-to-filename
 typeset -A seen
@@ -10,7 +10,7 @@ while read url ; do
     seen[$dir]=1
     [[ -e $dir ]] && continue || :
     mkdir -p $dir/{cur,new,tmp} # make it maildir
-    echo "$url" > $dir/url
+    print -- "$url" > $dir/url
     print $dir
 done
 for dir (feeds/*) [[ $seen[$dir] -eq 1 ]] || print disappeared: $dir