Fix cert scripts not working properly

In fact, why "tee" fixed it is a mystery for me

Signed-off-by: Jan Pokorný <jpokorny@redhat.com>

2 files changed, 10 insertions, 7 deletions

diff --git a/scripts/certs/cert-check b/scripts/certs/cert-check
index fe015ed..4bf9fc5 100755
--- a/scripts/certs/cert-check
+++ b/scripts/certs/cert-check
@@ -168,6 +168,7 @@ setup() {
 teardown() {
 	${RESTOREUMASK}
 	unset RESTOREUMASK
+	unset vercmd
 	return $1
 }
 
diff --git a/scripts/certs/cert-import b/scripts/certs/cert-import
index 8e2bad5..46e2fe0 100755
--- a/scripts/certs/cert-import
+++ b/scripts/certs/cert-import
@@ -57,15 +57,16 @@ cert_import() {
 	[ "$1" = "-nocrl" ] && shift && crl=0
 	(
 	  cert_pick "$@" | cert_check $crl \
-	    | tee >( openssl x509 \
-	             | tee >(cert_import_homebundle $homebundle) \
-	             | tee >(cert_import_firefox $firefox) \
-	             | cert_import_mutt $mutt ) \
-	    | tee >( openssl crl \
-	             | cert_import_homebundle $homebundle)
+	    | tee >(openssl x509 \
+	      | tee >(cert_import_homebundle $homebundle) \
+	      | tee >(cert_import_firefox $firefox) \
+	      | tee >(cert_import_mutt $mutt)) \
+	    | tee >(openssl crl \
+	      | tee >(cert_import_homebundle $homebundle))
 	) |& colorize 1
 }
 
+# see cert-check
 #setup() {
 #	set -u
 #	RESTOREUMASK=$(umask -p)
@@ -85,4 +86,5 @@ cert_import() {
     && echo "usage: $0" \
             "(homebundle|mutt|firefox|all)*" \
 	    "[-nocrl] file-or-server [port=443]" \
-    || { setup; cert_import "$@"; teardown $?; }; }
+    || { setup; cert_import "$@"; teardown $?; };
+  }