From a4247aa8a445fb8e018cf3cc0e42230cb413b827 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Sun, 18 Feb 2024 21:56:13 +0300 Subject: [PATCH] Style fixes --- galgen | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/galgen b/galgen index 9d401b7..df2c2a5 100755 --- a/galgen +++ b/galgen @@ -3,7 +3,7 @@ VERSION=0.7.0 -set -e +setopt ERR_EXIT pagesize=${PAGESIZE:-100} ordering=${ORDERING:-Om} @@ -41,7 +41,7 @@ src=() imgs=((*.jxl)($ordering)) pages=$(( ${#imgs} / $pagesize )) -[[ $(( $pages * $pagesize )) -lt ${#imgs} ]] && pages=$(( $pages + 1 )) +[[ $(( $pages * $pagesize )) -ge ${#imgs} ]] || pages=$(( $pages + 1 )) local tmp=`mktemp` trap "rm -f $tmp" HUP PIPE INT QUIT TERM EXIT @@ -57,10 +57,10 @@ else pngs=() for img ($imgs) { [[ -r .info/$img.img ]] - [[ -r alt/$img.jpg ]] || [[ -r alt/$img.png ]] && : || { + if ! [[ ( -r alt/$img.jpg ) || ( -r alt/$img.png ) ]] ; then grep -q "JPEG bitstream reconstruction" .info/$img.img && jpgs=($jpgs $img) || pngs=($pngs $img) - } + fi [[ -r preview/$img.webp ]] || pams=($pams $img) } @@ -118,12 +118,12 @@ EOF [[ $i -eq ${#imgs} ]] || echo ">>>" >> $tmp echo "
\"$img\"" >> $tmp - [[ -r ${img}.txt ]] && { + [[ ! -r ${img}.txt ]] || { echo "
" >> $tmp
         cat ${img}.txt >> $tmp
         echo "
" >> $tmp } - [[ -r ${img}.html ]] && cat ${img}.html >> $tmp + [[ ! -r ${img}.html ]] || { cat ${img}.html >> $tmp } echo "
" >> $tmp [[ -r .info/$img.img ]] echo "
" >> $tmp
@@ -169,13 +169,13 @@ EOF
     
 
 EOF
-    [[ $p -eq 1 ]] && {
-        [[ -r .txt ]] && {
+    [[ $p -ne 1 ]] || {
+        [[ ! -r .txt ]] || {
             echo "
" >> $tmp
             cat .txt >> $tmp
             echo "
" >> $tmp
         }
-        [[ -r .html ]] && cat .html >> $tmp
+        [[ ! -r .html ]] || { cat .html >> $tmp }
     }
     [[ $p -eq 1 ]] ||
         echo "<<<" >> $tmp
@@ -190,7 +190,7 @@ EOF
         echo "" >> $tmp
         alt="preview ${img}"
         title=""
-        [[ -r ${imgs[$img]}.txt ]] && {
+        [[ ! -r ${imgs[$img]}.txt ]] || {
             alt=`cat ${imgs[$img]}.txt`
             title="title=\"$alt\""
         }
-- 
2.44.0