X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Fsiteup.sh;h=8c186ad904da0b05d1af6fdefeda797f2d1b845f;hb=9f3e83fc4e946639c89eeb37b54c21ecc4f40425;hp=a63744be2ee02355999c770401ca0c74a3932ded;hpb=c53d13827ddead7cdc1c959890829296a0e7f0f4;p=feisty_meow.git diff --git a/scripts/site_avenger/siteup.sh b/scripts/site_avenger/siteup.sh index a63744be..8c186ad9 100644 --- a/scripts/site_avenger/siteup.sh +++ b/scripts/site_avenger/siteup.sh @@ -5,7 +5,7 @@ # updates a site avenger app. -export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory. +export THISDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory. ############################ @@ -15,22 +15,23 @@ export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's work app_dirname="$1"; shift repo_name="$1"; shift -source "$WORKDIR/shared_site_mgr.sh" +source "$THISDIR/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" # use our default values for the repository and theme if they're not provided. if [ -z "$repo_name" ]; then