From c1da7ec2a12e494af9393a1227705b563c45761c Mon Sep 17 00:00:00 2001
From: nickchomey <88559987+nickchomey@users.noreply.github.com>
Date: Tue, 10 May 2022 09:22:51 -0600
Subject: [PATCH] Update venvsetup.sh

---
 install/venvsetup.sh | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/install/venvsetup.sh b/install/venvsetup.sh
index b32d97fe7..be5511299 100644
--- a/install/venvsetup.sh
+++ b/install/venvsetup.sh
@@ -753,17 +753,11 @@ echo -e "\nonly use this feature if you are a \e[31mdeveloper\e[39m"
 #fi
 fi
 
-echo -e "\nPlease choose to use default admin password \e[31m1234567\e[39m, randomly generate one \e[31m(recommended)\e[39m or specify the admin password?"
-printf "%s" "Choose [d]fault, [r]andom or [s]et password: [d/r/s] "
+echo -e "\nPlease choose to use a randomly generated password \e[31m(recommended)\e[39m or specify the admin password?"
+printf "%s" "Choose [r]andom or [s]et password: [r/s] "
 read TMP_YN
 
-if [[ $TMP_YN =~ ^(d|D| ) ]] || [[ -z $TMP_YN ]]; then
-	ADMIN_PASS="1234567"
-	echo -e "\nAdmin password will be set to $ADMIN_PASS\n"
-elif [[ $TMP_YN =~ ^(r|R) ]] ; then
-	ADMIN_PASS=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 16 ; echo '')
-	echo -e "\nAdmin password will be provided once installation is completed...\n"
-elif [[ $TMP_YN =~ ^(s|S) ]] ; then
+if [[ $TMP_YN =~ ^(s|S) ]] ; then
 	echo -e "\nPlease enter your password:"
 	printf "%s" ""
 	read TMP_YN
@@ -790,9 +784,9 @@ elif [[ $TMP_YN =~ ^(s|S) ]] ; then
 		echo -e "\nRepeated password didn't match , please check...\n"
 		exit
 	fi
-else
-	ADMIN_PASS="1234567"
-	echo -e "\nAdmin password will be set to $ADMIN_PASS\n"
+else [[ $TMP_YN =~ ^(r|R) ]] ; then
+	ADMIN_PASS=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 16 ; echo '')
+	echo -e "\nAdmin password will be provided once installation is completed...\n"
 fi
 
 echo -e "\nDo you wish to install Memcached extension and backend?"
@@ -1287,4 +1281,4 @@ pip_virtualenv
 
 system_tweak
 
-main_install
\ No newline at end of file
+main_install