quasseluser-* improvements

6 files changed, 54 insertions, 19 deletions

diff --git a/create-quasselcore-user b/create-quasselcore-user
deleted file mode 100755
index 3ec9915..0000000
--- a/create-quasselcore-user
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-create_quasselcore_user()
-{
-  username=$1
-  [ "$username" ]
-  if ! read password || ! [ "$password" ]
-  then
-    password=$(tr -cd a-z < /dev/urandom | head -c16)
-  fi
-  printf '%s\n' "$username" "$password" "$password"  | ./run-quasselcore --add-user
-}
-
-set -e
-[ $# -eq 1 ]
-create_quasselcore_user "$@"
-
diff --git a/quasseluser-check-password b/quasseluser-check-password
index b6f2351..ca2d4c8 100755
--- a/quasseluser-check-password
+++ b/quasseluser-check-password
@@ -11,6 +11,7 @@ salt=${qpass#*:}
 if ! [ "$PASSWORD" ]
 then
   read -s -p "Password to check: " PASSWORD
+  echo >&2
 fi
 
 ourhash=$(printf %s%s "$PASSWORD" "$salt" | sha512sum)
diff --git a/quasseluser-create b/quasseluser-create
new file mode 100755
index 0000000..7665cf4
--- /dev/null
+++ b/quasseluser-create
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+quasseluser_create()
+{
+  username=$1
+  [ "$username" ]
+
+  prompt=
+  if test -t 0
+  then
+    prompt="Enter new password for user \"$username\": "
+  fi
+  if ! read ${prompt:+ -p "$prompt"} -s password || ! [ "$password" ]
+  then
+    password=$(tr -cd a-z < /dev/urandom | head -c16)
+  fi
+  printf '%s\n' "$username" "$password" "$password"  | ./run-quasselcore --add-user
+}
+
+set -e
+[ $# -eq 1 ]
+quasseluser_create "$1"
+
diff --git a/reset-quasselcore-user-password b/quasseluser-reset-password
index 936b9dd..2a12165 100755
--- a/reset-quasselcore-user-password
+++ b/quasseluser-reset-password
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-reset_quasselcore_user_password()
+quasseluser_reset_password()
 {
   username=$1
   password=$2
@@ -9,5 +9,6 @@ reset_quasselcore_user_password()
 
 set -e
 [ $# -eq 2 ]
-reset_quasselcore_user_password "$@"
+quasseluser_reset_password "$@"
+
 
diff --git a/quasseluser-set-password b/quasseluser-set-password
new file mode 100755
index 0000000..c0226d1
--- /dev/null
+++ b/quasseluser-set-password
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+quasseluser_set_password()
+{
+  username=$1
+  password=$2
+  printf '%s\n' "$password" "$password" | ./run-quasselcore --change-userpass "$username"
+}
+
+set -e
+[ $# -eq 1 ]
+[ "$1" ]
+if ! [ "$PASSWORD" ]
+then
+  if test -t 0
+  then
+    prompt="Enter new password for user \"$1\": "
+  else
+    prompt=
+  fi
+  read -s ${prompt:+ -p "$prompt"} PASSWORD
+fi
+[ "$PASSWORD" ]
+
+quasseluser_set_password "$1" "$PASSWORD"
diff --git a/quasseluser-users b/quasseluser-users
new file mode 100755
index 0000000..a529dcc
--- /dev/null
+++ b/quasseluser-users
@@ -0,0 +1,2 @@
+#!/bin/sh
+./quasselcore-sqlite "select username from quasseluser"