X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Favcoreup.sh;h=2ae511cbb8eb50148b9efd2841ee0bddf088463e;hb=51356b493613a783d95f8ba5f6ef7777c8e50f5a;hp=2fc6e46cbb6a6a62cc2ba9c949accdb8e379d6af;hpb=fc51448ac8c18804d3cfc1997af3eaca5fad4c2e;p=feisty_meow.git

diff --git a/scripts/site_avenger/avcoreup.sh b/scripts/site_avenger/avcoreup.sh
index 2fc6e46c..2ae511cb 100644
--- a/scripts/site_avenger/avcoreup.sh
+++ b/scripts/site_avenger/avcoreup.sh
@@ -6,10 +6,6 @@
 # updates just the site avenger core portion of an 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"
 
 ############################
 
@@ -18,25 +14,27 @@ source "$WORKDIR/site_avenger.config"
 # check for parameters.
 app_dirname="$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"
 
 # simplistic approach here; just go to the folder and pull the changes.
 
 pushd "$full_app_dir" &>/dev/null
-test_or_fail "Changing to app path '$full_app_dir'"
+test_or_die "Changing to app path '$full_app_dir'"
 
 dir="avenger5/vendor/siteavenger/avcore"
 if [ ! -d $dir ]; then
@@ -45,7 +43,7 @@ else
   pushd "$dir" &>/dev/null
 
   git pull
-  test_or_fail "Pulling git repo for avcore under '$full_app_dir'"
+  test_or_die "Pulling git repo for avcore under '$full_app_dir'"
 
   echo "Finished updating the avcore portion of site in ${app_dirname}."