X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Fteardown.sh;h=68fa0e14e979bfd32b283d05539359df92d989ef;hb=9f3e83fc4e946639c89eeb37b54c21ecc4f40425;hp=5bfcbd4699b9a01696af8f4a85ebd8e6b9bb2252;hpb=b1436548fd05e1f83162f50c57285e7e0b53992c;p=feisty_meow.git diff --git a/scripts/site_avenger/teardown.sh b/scripts/site_avenger/teardown.sh index 5bfcbd46..68fa0e14 100644 --- a/scripts/site_avenger/teardown.sh +++ b/scripts/site_avenger/teardown.sh @@ -5,8 +5,8 @@ # # Author: Chris Koeritz -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" @@ -43,11 +43,11 @@ fi # through to ask for access. sudo bash -c 'echo sudo permissions acquired.' -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 @@ -56,6 +56,7 @@ if [ -z "$app_dirname" ]; then else test_app_folder "$BASE_APPLICATION_PATH" "$app_dirname" fi +test_or_die "finding and testing app folder" sep