From: Sergey Matveev Date: Mon, 29 Jul 2024 06:47:52 +0000 (+0300) Subject: Unify redirection operator usage X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=83a732a7352e320ad16c8fee9854f9fa2ba1965e;p=zeasypki.git Unify redirection operator usage --- diff --git a/zeasypki b/zeasypki index 230acf7..90ddb74 100755 --- a/zeasypki +++ b/zeasypki @@ -45,7 +45,7 @@ key_get() { if [[ -s $1/key.pem ]] ; then REPLY=`< ${1}/key.pem` else - REPLY=`key_decrypt < ${1}/key.pem.enc` + REPLY=`key_decrypt <${1}/key.pem.enc` fi } @@ -60,13 +60,13 @@ ca_new_xdsa() { local tmpl=`mktemp` local cert=`mktemp` trap "rm -f $key $tmpl $cert" HUP PIPE INT QUIT TERM EXIT - cat > $tmpl <$tmpl < $key + certtool_genkey "$keytype" >$key certtool \ --generate-self-signed \ --load-privkey $key \ @@ -108,7 +108,7 @@ ee_renew_xdsa() { mapfile[$cakey]=$REPLY key_get ee/$algo/$ca/$domain mapfile[$key]=$REPLY - cat > $tmpl <$tmpl <> $cakey - cat >> $cakey < ca/gost/$ca/cer.pem + print >>$cakey + cat >>$cakey $key.enc + key_encrypt <$key >$key.enc rm $key ;; (new) @@ -221,9 +221,9 @@ case $1 in } _umask=`umask` umask 077 - ee_key_new_${algo} > $dst/key.pem + ee_key_new_${algo} >$dst/key.pem umask $_umask - ee_renew_${algo} $ca $domain > $dst/cer.pem + ee_renew_${algo} $ca $domain >$dst/cer.pem ;; (renew) [[ $# -eq 2 ]] || usage @@ -231,11 +231,11 @@ case $1 in algo=${cols[2]} ca=${cols[3]} domain=${cols[4]} - ee_renew_${algo} $ca $domain > ee/$algo/$ca/$domain/cer.pem + ee_renew_${algo} $ca $domain >ee/$algo/$ca/$domain/cer.pem ;; (dane) [[ $# -eq 2 ]] || usage - dane_${${(s:/:)2}[2]} < $2/cer.pem + dane_${${(s:/:)2}[2]} <$2/cer.pem ;; (keypair) [[ $# -eq 2 ]] || usage @@ -247,7 +247,7 @@ case $1 in zmodload -F zsh/datetime b:strftime export LC_ALL=C for cer (**/cer.pem) { - certtool --certificate-info < $cer | while read line ; do + certtool --certificate-info <$cer | while read line ; do [[ ! $line =~ "^Not After: .*" ]] || break done [[ $MATCH ]]