changeset 2041:d61ca2b3fc12 unify_imports

Merged default into branch.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Fri, 25 Jan 2019 14:33:03 +0100
parents f1e32babb587 (current diff) ce294a8635a5 (diff)
children d29ac997eb34
files
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/schema/install-db.sh	Fri Jan 25 12:57:53 2019 +0100
+++ b/schema/install-db.sh	Fri Jan 25 14:33:03 2019 +0100
@@ -47,8 +47,13 @@
 genpw()
 # $1 - length
 {
-  dd count=1 if=/dev/urandom 2>/dev/null \
-    | tr -cd '[:alnum:],._!?-' | tail -c "$1"
+  PW=''
+  until [ "$(grep '[^[:alnum:]]' <<<$PW)" -a "$(grep '[[:digit:]]' <<<$PW)" ]
+  do
+    PW=$(dd count=1 if=/dev/urandom 2>/dev/null \
+           | tr -cd '[:alnum:],._!?-' | tail -c "$1")
+  done
+  echo "$PW"
 }
 
 # Defaults: