X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Fsiteup.sh;h=d3ff8125894475dec8eac6d5728136cc1187849f;hb=f784ba54b77cfeee2b1840e7b30dc1ac689d4dde;hp=a63744be2ee02355999c770401ca0c74a3932ded;hpb=9767543e09806172d5ff8bd3f4d8cb9ddd087601;p=feisty_meow.git diff --git a/scripts/site_avenger/siteup.sh b/scripts/site_avenger/siteup.sh index a63744be..d3ff8125 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 +exit_on_error "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 @@ -42,7 +43,7 @@ sep # this should set the site_store_path variable if everything goes well. update_repo "$full_app_dir" "$CHECKOUT_DIR_NAME" "$DEFAULT_REPOSITORY_ROOT" "$repo_name" -test_or_die "Updating the repository storage directory" +exit_on_error "Updating the repository storage directory" ####