quasseluser-reset-password: less output if no errorHEADmaster

1 files changed, 16 insertions, 2 deletions

diff --git a/quasseluser-reset-password b/quasseluser-reset-password
index bd068ad..0d7a727 100755
--- a/quasseluser-reset-password
+++ b/quasseluser-reset-password
@@ -1,15 +1,29 @@
 #!/bin/sh
 
+change_userpass()
+{
+  printf '%s\n' "$password" "$password"  | ./run-quasselcore --change-userpass "$username"
+}
+
 quasseluser_reset_password()
 {
   username=$1
   [ "$username" ]
   password=$(tr -cd a-z </dev/urandom | head -c15)
   [ "$password" ]
-  printf '%s\n' "$password" "$password"  | ./run-quasselcore --change-userpass "$username"
   if [ -t 0 ]
   then
-    printf "User; %s\nPassword: %s\n" "$username" "$password"
+    err_out=$(mktemp)
+    trap 'rm -f "$err_out"' EXIT
+    if change_userpass >"$err_out" 2>&1
+    then
+      printf "User: %s\nPassword: %s\n" "$username" "$password"
+    else
+      cat "$err_out"
+      exit 1
+    fi
+  else
+    change_userpass
   fi
 }