X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Fsiteup.sh;h=282d0cdc060f93a7d25746a89f32f43b12c078c6;hb=14cfed0371a6604dfb59c0ebac8418d32e729297;hp=c9b348c48fd0cee2c9fcbb30bfb6979900dd3d26;hpb=170a8e062d9283e65716e7aa55930ade13a66f7a;p=feisty_meow.git diff --git a/scripts/site_avenger/siteup.sh b/scripts/site_avenger/siteup.sh index c9b348c4..282d0cdc 100644 --- a/scripts/site_avenger/siteup.sh +++ b/scripts/site_avenger/siteup.sh @@ -6,10 +6,6 @@ # updates a site avenger app. export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )" # obtain the script's working directory. -source "$WORKDIR/shared_site_mgr.sh" - -# get our defaults. -source "$WORKDIR/site_avenger.config" ############################ @@ -19,20 +15,22 @@ source "$WORKDIR/site_avenger.config" app_dirname="$1"; shift repo_name="$1"; shift +source "$WORKDIR/shared_site_mgr.sh" + sep -check_application_dir "$APPLICATION_DIR" +check_application_dir "$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 # 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