X-Git-Url: https://git.hcoop.net/hcoop/scripts.git/blobdiff_plain/6157acaa8da2aec73ed1958ad02cdb9b6c300aaf..8b3e03c4cf4a2843d66ff1c55e1270c7330ed982:/new-user?ds=sidebyside

diff --git a/new-user b/new-user
index 56d7845..bf3ca2e 100755
--- a/new-user
+++ b/new-user
@@ -14,13 +14,13 @@ if test -z "$REALNM"; then
 	exit 1
 fi
 
-INITPW=$(sudo -u hcoop psql hcoop_hcoop -tc "select unix_passwd from MemberApp where name = '${USERNM}';")
+INITPW=$(sudo -u hcoop psql -h postgres -p 5433 hcoop_portal3 -tc "select unix_passwd from MemberApp where name = '${USERNM}' order by id desc limit 1;")
 
 
 #
 # Create user
 #
-/afs/hcoop.net/common/etc/scripts/create-user $USERNM || \
+/afs/hcoop.net/common/etc/scripts/create-user-new $USERNM || \
 ( echo "create-user $USERNM failed" && exit 2 )
 
 #
@@ -43,7 +43,7 @@ if test -z "$INITPW"; then
 else
 	echo Setting password from database
 	actual_user=`whoami`
-	sudo sh -c "echo $INITPW | tee -| /afs/hcoop.net/common/etc/scripts/change-user-password $USERNM" || \
+	sudo sh -c "printf '%s\n%s\n' $INITPW $INITPW  | /afs/hcoop.net/common/etc/scripts/change-user-password $USERNM" || \
 	( echo "echo XXX | tee - | change-user-password $USERNM failed" && exit 5 )
 fi