Merge branch 'release-2.140.109'

[feisty_meow.git] / scripts / site_avenger / revamp_cakelampvm.sh

diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh
index 773e5a8909ec6ce70c1d92b1c8e3790b5c12fde6..2b021416b3ba7fb66642af5856f11ae29c8dca6d 100644 (file)
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@ -22,30 +22,16 @@ source "$FEISTY_MEOW_SCRIPTS/security/password_functions.sh"
 
 ##############
 
-# new requirement to have the sql root password, since we need to do some sql db configuration.
-
-echo A
+# it's a requirement to have sql root password, since we may need some sql db configuration.
 load_password /etc/mysql/secret_password mysql_passwd
-echo B
-if [ -z "$mysql_password" ]; then
-echo C
-  read_password "Please enter the MySQL root account password:" mysql_password
-echo D
-#  echo -n "Please enter the MySQL root account password: "
-#  # turn off echo but remember former setting.
-#  stty_orig=`stty -g`
-#  stty -echo
-#  read mysql_passwd
-#  # turn echo back on.
-#  stty $stty_orig
+if [ -z "$mysql_passwd" ]; then
+  read_password "Please enter the MySQL root account password:" mysql_passwd
 fi
 if [ -z "$mysql_passwd" ]; then
-echo E
   echo "This script must have the sql root password to proceed."
   exit 1
 else
-echo F
-  store_password /etc/mysql/secret_password "$mysql_password"
+  store_password /etc/mysql/secret_password "$mysql_passwd"
 fi
 
 ##############
@@ -338,7 +324,9 @@ fi
 
 sep
 
-# next bit can go here.
+echo Adding site avenger packages to composer.
+# add in site avenger dependencies so we can build avcore properly.
+composer config -g repositories.siteavenger composer https://packages.siteavenger.com/
 
 ##############
 ##############