set -e doesn't catch failures inside <()

[overonion] / overonion-make-key

diff --git a/overonion-make-key b/overonion-make-key
index ff094721f5e03a1a82418c48111c1419e701936a..7d0ff1ac6b69d9d61ef57c6ec594f1261e0174ce 100755 (executable)
--- a/overonion-make-key
+++ b/overonion-make-key
@@ -33,9 +33,20 @@ if [[ -e "$keyfile" ]];then
   exit 1
 fi
 
   exit 1
 fi
 

-i=0
-while read -r cipher;do
-  echo -n $'\r'"Generating key $((++i))/${#ciphers[*]}" >&2
-  cat >> "$keyfile" <<< "openssl-enc $cipher $(head -c 99 "$random_source" | base64 --wrap=0 )"
-done < <( IFS=$'\n'; shuf <<< "${ciphers[*]}"; )
-echo >&2
+keys_needed=$((${#ciphers[*]} * 2))
+keys_generated=0
+
+function generate_keys() {
+  while read -r cipher;do
+    echo -n $'\r'"Generating key $((++keys_generated))/$keys_needed" >&2
+    echo "openssl-enc $cipher $(head -c 99 "$random_source" | base64 --wrap=0 )"
+  done < <( IFS=$'\n'; shuf <<< "${ciphers[*]}"; )
+}
+
+{
+  generate_keys
+  echo "reverse"
+  generate_keys
+} > "$keyfile"
+
+echo 2>&1