X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Favcoreup.sh;h=33c3daafe142c01b70412268dd0ef332e8392e4a;hb=d4e4de4eca76bdb1a37e949ed80471615dc5fba3;hp=6462dea20f0faf3e2a8948a3adbe59ebb00fe3e0;hpb=d1413a80a384c0849c18466ff06d3054de7fc2f6;p=feisty_meow.git diff --git a/scripts/site_avenger/avcoreup.sh b/scripts/site_avenger/avcoreup.sh index 6462dea2..33c3daaf 100644 --- a/scripts/site_avenger/avcoreup.sh +++ b/scripts/site_avenger/avcoreup.sh @@ -7,8 +7,6 @@ export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory. -source "$WORKDIR/shared_site_mgr.sh" - ############################ # main body of script. @@ -16,20 +14,23 @@ source "$WORKDIR/shared_site_mgr.sh" # check for parameters. app_dirname="$1"; shift +source "$WORKDIR/shared_site_mgr.sh" + sep -check_application_dir "$APPLICATION_DIR" +check_apps_root "$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 +test_or_die "finding and testing app folder" # where we expect to find our checkout folder underneath. -full_app_dir="$APPLICATION_DIR/$app_dirname" +full_app_dir="$BASE_APPLICATION_PATH/$app_dirname" # simplistic approach here; just go to the folder and pull the changes.