Error messages on stderr

diff --git a/overonion b/overonion
index 600dafbd1839bb2bd1c48d4b84d2e179df9c62f3..a33351a7ece4153b72b765c204c01ac66c37f975 100755 (executable)
--- a/overonion
+++ b/overonion
@@ -1,28 +1,28 @@
 #!/bin/bash
 
 #!/bin/bash
 

-if (( $# != 2));then
-  echo "usage: overonion e|d keyfile"
+function die() {
+  echo "$*" >&2

   exit 1
   exit 1

+}
+
+if (( $# != 2));then
+  die "usage: overonion e|d keyfile"

 fi
 mode=$1
 if [[ "$mode" != e && "$mode" != d ]];then
 fi
 mode=$1
 if [[ "$mode" != e && "$mode" != d ]];then

-  echo "Use 'e' for encrypt or 'd' for decrypt"
-  exit 1
+  die "Use 'e' for encrypt or 'd' for decrypt"

 fi
 keyfile=$2
 if [[ ! -e "$keyfile" ]];then
 fi
 keyfile=$2
 if [[ ! -e "$keyfile" ]];then

-  echo "Keyfile not found"
-  exit 1
+  die "Keyfile not found"

 fi
 if [[ ! -r "$keyfile" ]];then
 fi
 if [[ ! -r "$keyfile" ]];then

-  echo "Cannot read keyfile"
-  exit 1
+  die "Cannot read keyfile"

 fi
 
 num_layers=$(wc -l < "$keyfile")
 if (( num_layers < 20 ));then
 fi
 
 num_layers=$(wc -l < "$keyfile")
 if (( num_layers < 20 ));then

-  echo "Keyfile doesn't have enough layers to be an onion"
-  exit 1
+  die "Keyfile doesn't have enough layers to be an onion"

 fi
 
 if [[ "$mode" == e ]];then
 fi
 
 if [[ "$mode" == e ]];then

diff --git a/overonion-make-key b/overonion-make-key
index 6cfc349bec66f01ae84766f39878717d77a223f3..da564ad39227896970b3093a29e75c06ac369ae6 100755 (executable)
--- a/overonion-make-key
+++ b/overonion-make-key
@@ -24,18 +24,18 @@ if [[ "$1" == '--make_INSECURE_key' ]];then
 fi
 
 if (( $# != 1));then
 fi
 
 if (( $# != 1));then

-  echo "usage: overonion-make-key keyfile"
+  echo "usage: overonion-make-key keyfile" >&2

   exit 1
 fi
 keyfile=$1
 if [[ -e "$keyfile" ]];then
   exit 1
 fi
 keyfile=$1
 if [[ -e "$keyfile" ]];then

-  echo "That keyfile already exists.  I refuse to overwrite it."
+  echo "That keyfile already exists.  I refuse to overwrite it." >&2

   exit 1
 fi
 
 i=0
 while read -r cipher;do
   exit 1
 fi
 
 i=0
 while read -r cipher;do

-  echo -n $'\r'"Generating key $((++i))/${#ciphers[*]}"
+  echo -n $'\r'"Generating key $((++i))/${#ciphers[*]}" >&2

   cat >> "$keyfile" <<< "$cipher $(head -c 99 "$random_source" | base64 --wrap=0 )"
 done < <( IFS=$'\n'; shuf <<< "${ciphers[*]}"; )
   cat >> "$keyfile" <<< "$cipher $(head -c 99 "$random_source" | base64 --wrap=0 )"
 done < <( IFS=$'\n'; shuf <<< "${ciphers[*]}"; )

-echo
+echo >&2