X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Fpowerup.sh;h=28e03240535621e09910b5bba5223a51ba31cf78;hb=2e93c29a45ae9d58694c0de962151e6829739380;hp=46070f60c9e3a973e2803e8b4826f3807080edc5;hpb=f8c8e666cc22c5cc3a18311ee8f534becfa23ca7;p=feisty_meow.git diff --git a/scripts/site_avenger/powerup.sh b/scripts/site_avenger/powerup.sh index 46070f60..28e03240 100644 --- a/scripts/site_avenger/powerup.sh +++ b/scripts/site_avenger/powerup.sh @@ -20,8 +20,8 @@ # It will have to be told the theme name, but will assume it's 'Turtle' to # 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 )" +export THISDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory. +export FEISTY_MEOW_APEX="$( \cd "$THISDIR/../.." && \pwd )" source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh" @@ -55,11 +55,11 @@ if [ "$app_dirname" == "-help" -o "$app_dirname" == "--help" ]; then print_instructions fi -source "$WORKDIR/shared_site_mgr.sh" +source "$THISDIR/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 @@ -68,6 +68,7 @@ if [ -z "$app_dirname" ]; then else test_app_folder "$BASE_APPLICATION_PATH" "$app_dirname" fi +test_or_die "finding and testing app folder" # where we expect to find our checkout folder underneath. full_app_dir="$BASE_APPLICATION_PATH/$app_dirname"