Merge branch 'master' of feistymeow.org:feisty_meow

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

diff --git a/scripts/site_avenger/siteup.sh b/scripts/site_avenger/siteup.sh
index 511a561734bfdad51925a69afe95162efd36bcff..a63744be2ee02355999c770401ca0c74a3932ded 100644 (file)
--- 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,6 +15,8 @@ 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"
@@ -44,7 +42,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_fail "Updating the repository storage directory"
+test_or_die "Updating the repository storage directory"
 
 ####