Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.91

[feisty_meow.git] / scripts / site_avenger / avcoreup.sh

diff --git a/scripts/site_avenger/avcoreup.sh b/scripts/site_avenger/avcoreup.sh
index 2fc6e46cbb6a6a62cc2ba9c949accdb8e379d6af..f759494973e4b686b50d8d61807810e89869dfef 100644 (file)
--- 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,6 +14,8 @@ source "$WORKDIR/site_avenger.config"
 # check for parameters.
 app_dirname="$1"; shift
 
+source "$WORKDIR/shared_site_mgr.sh"
+
 sep
 
 check_application_dir "$APPLICATION_DIR"
@@ -36,7 +34,7 @@ full_app_dir="$APPLICATION_DIR/$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}."