X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Fpowerup.sh;h=ff2a99441a825320fc6742edd78d57bf6421439e;hb=0b6e422c239b59810f7eb2b33abff3c0fe9b720f;hp=05181fb5c080f518ab4f74958f2ba75796e317de;hpb=187267945b27b007156109234a721ffb08f0e99e;p=feisty_meow.git

diff --git a/scripts/site_avenger/powerup.sh b/scripts/site_avenger/powerup.sh
index 05181fb5..ff2a9944 100644
--- a/scripts/site_avenger/powerup.sh
+++ b/scripts/site_avenger/powerup.sh
@@ -21,20 +21,23 @@
 # start with.  The concept of the theme comes from cakephp.
 
 export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )"  # obtain the script's working directory.
+export FEISTY_MEOW_APEX="$( \cd "$WORKDIR/../.." && \pwd )"
+
+source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"
 
 ############################
 
 function print_instructions()
 {
   echo
-  echo "$(basename $0 .sh) [app dirname] [repository] [theme name] [user name]"
+  echo "$(basename $0 .sh) [app dirname] [repository] [theme name] "
+#[user name]
   echo
   echo "All parameters are optional, and intelligent guesses for them will be made."
   echo
   echo "app dirname: The folder where the app will be stored."
   echo "repository: The name of the git repository (short version, no URL)."
   echo "theme name: The name to use for the cakephp theme."
-  echo "user name: The name of the user to chown the checkout to."
   echo
   exit 0
 }
@@ -47,10 +50,6 @@ function print_instructions()
 app_dirname="$1"; shift
 repo_name="$1"; shift
 theme_name="$1"; shift
-user_name="$1"; shift
-
-echo stopping with user name is $user_name
-exit 1
 
 if [ "$app_dirname" == "-help" -o "$app_dirname" == "--help" ]; then
   print_instructions
@@ -60,18 +59,18 @@ source "$WORKDIR/shared_site_mgr.sh"
 
 sep
 
-check_application_dir "$APPLICATION_DIR"
+check_application_dir "$BASE_APPLICATION_PATH"
 
 # find proper webroot where the site will be initialized.
 if [ -z "$app_dirname" ]; then
   # no dir was passed, so guess it.
-  find_app_folder "$APPLICATION_DIR"
+  find_app_folder "$BASE_APPLICATION_PATH"
 else
-  test_app_folder "$APPLICATION_DIR" "$app_dirname"
+  test_app_folder "$BASE_APPLICATION_PATH" "$app_dirname"
 fi
 
 # where we expect to find our checkout folder underneath.
-full_app_dir="$APPLICATION_DIR/$app_dirname"
+full_app_dir="$BASE_APPLICATION_PATH/$app_dirname"
 
 # use our default values for the repository and theme if they're not provided.
 if [ -z "$repo_name" ]; then
@@ -104,11 +103,16 @@ create_site_links "$site_store_path" "$theme_name"
 
 sep
 
-if [ ! -z "$user_name" ]; then
+# go with the default user running the script.
+user_name=$USER
+if [ ! -z "$user_name" -a "$user_name" != "root" ]; then
   echo "Chowning the apps folder to be owned by: $user_name"
 #hmmm: have to hope for now for standard group named after user 
-  chown -R "$user_name:$user_name" "$APPLICATION_DIR"
-  test_or_die "Chowning $APPLICATION_DIR to be owned by $user_name"
+  chown -R "$user_name:$user_name" "$BASE_APPLICATION_PATH"
+  test_or_die "Chowning $BASE_APPLICATION_PATH to be owned by $user_name"
+
+else
+echo "user name failed checks for chowning, was '$user_name'"
 fi
 
 sep