From df7af2695382e5d505f32d6bb931fbfdc7de26f7 Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 18 Feb 2024 21:57:43 +0300
Subject: [PATCH] Style fixes

---
 zeasypki | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/zeasypki b/zeasypki
index f91c616..230acf7 100755
--- a/zeasypki
+++ b/zeasypki
@@ -2,7 +2,7 @@
 # zeasypki -- easy PKI
 # Copyright (C) 2022-2024 Sergey Matveev <stargrave@stargrave.org>
 
-set -e
+setopt ERR_EXIT PIPE_FAIL
 
 COUNTRY=${COUNTRY:-RU}
 
@@ -42,9 +42,11 @@ zmodload -F zsh/files b:zf_mkdir
 zmodload zsh/mapfile
 
 key_get() {
-    [[ -s $1/key.pem ]] &&
-        REPLY=`< ${1}/key.pem` ||
+    if [[ -s $1/key.pem ]] ; then
+        REPLY=`< ${1}/key.pem`
+    else
         REPLY=`key_decrypt < ${1}/key.pem.enc`
+    fi
 }
 
 certtool_genkey() {
@@ -181,7 +183,7 @@ case $1 in
     domain=$3
     dst=ca/$algo/$domain
     zf_mkdir -p $dst
-    [[ -s $dst/key.pem ]] && {
+    [[ ! -s $dst/key.pem ]] || {
         print $dst/key.pem already exists >&2
         exit 1
     }
@@ -213,7 +215,7 @@ case $1 in
     dst=ee/$algo/$ca/$domain
     [[ $dst = $2 ]]
     zf_mkdir -p $dst
-    [[ -s $dst/key.pem ]] && {
+    [[ ! -s $dst/key.pem ]] || {
         print $dst/key.pem already exists >&2
         exit 1
     }
@@ -246,7 +248,7 @@ case $1 in
     export LC_ALL=C
     for cer (**/cer.pem) {
         certtool --certificate-info < $cer | while read line ; do
-            [[ $line =~ "^Not After: .*" ]] && break
+            [[ ! $line =~ "^Not After: .*" ]] || break
         done
         [[ $MATCH ]]
         # Not After: Sat Jul 02 10:02:29 UTC 2022
-- 
2.44.0