X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Fpowerup.sh;h=c2ed28d5afaa15f9bb87d552dab1dccab7567528;hb=9c896e976257e24f70f347d913c0a20681b13c04;hp=cf8a5c437f99b9246d0fa3f962d2b22397052c8e;hpb=227fe618d54fc7569e18a2bc46a05655b6965b9b;p=feisty_meow.git diff --git a/scripts/site_avenger/powerup.sh b/scripts/site_avenger/powerup.sh index cf8a5c43..c2ed28d5 100644 --- a/scripts/site_avenger/powerup.sh +++ b/scripts/site_avenger/powerup.sh @@ -21,20 +21,24 @@ # 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 "user name: The name of the user to chown the checkout to." echo exit 0 } @@ -47,9 +51,9 @@ function print_instructions() app_dirname="$1"; shift repo_name="$1"; shift theme_name="$1"; shift -user_name="$1"; shift +#user_name="$1"; shift -echo "*** user name is $user_name" +#echo "*** user name is $user_name" if [ "$app_dirname" == "-help" -o "$app_dirname" == "--help" ]; then print_instructions @@ -59,18 +63,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 @@ -103,12 +107,12 @@ create_site_links "$site_store_path" "$theme_name" sep -if [ ! -z "$user_name" ]; 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" -fi +#if [ ! -z "$user_name" ]; 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" "$BASE_APPLICATION_PATH" +# test_or_die "Chowning $BASE_APPLICATION_PATH to be owned by $user_name" +#fi sep