Merge branch 'release-2.140.110'

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

diff --git a/scripts/site_avenger/standup.sh b/scripts/site_avenger/standup.sh
index 6e93af94cae42cd853af9f093bec1f448a374753..3ba100f36a7471bf39cc9bec7f7da9550c489387 100644 (file)
--- a/scripts/site_avenger/standup.sh
+++ b/scripts/site_avenger/standup.sh
@@ -49,14 +49,13 @@ fi
 
 # force the sudo at the start of the script, rather than waiting halfway
 # through to ask for access.
-#sudo bash -c 'echo sudo permissions acquired.'
-#hmmm: no longer necessary since whole script is sudoized from alias.
+sudo bash -c 'echo sudo permissions acquired.'
 
 source "$WORKDIR/shared_site_mgr.sh"
 
 sep
 
-check_application_dir "$BASE_APPLICATION_PATH"
+check_apps_root "$BASE_APPLICATION_PATH"
 
 # find proper webroot where the site will be initialized.
 if [ -z "$app_dirname" ]; then
@@ -65,6 +64,7 @@ if [ -z "$app_dirname" ]; then
 else
   test_app_folder "$BASE_APPLICATION_PATH" "$app_dirname"
 fi
+test_or_die "finding and testing app folder"
 
 #echo "!! domain being added is: $DOMAIN_NAME"
 
@@ -98,11 +98,6 @@ powerup "$APPLICATION_NAME" "$REPO_NAME" "$THEME_NAME"
 
 sep
 
-# run this again after checkout to ensure apache can write.
-fix_appdir_ownership "$BASE_APPLICATION_PATH" "$APPLICATION_NAME" 
-
-sep
-
 echo "
 Finished standing up the full domain and site for: ${app_dirname}
 The domain name is: $DOMAIN_NAME