modified error handling methods

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

diff --git a/scripts/site_avenger/avcoreup.sh b/scripts/site_avenger/avcoreup.sh
index 7ae0b6bacb7e0e8346fa848eb77775a2e902515e..5ccc61f78b68a1a273c53f6c0cd5852bfb74a56c 100644 (file)
--- a/scripts/site_avenger/avcoreup.sh
+++ b/scripts/site_avenger/avcoreup.sh
@@ -5,11 +5,7 @@
 
 # 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"
+export THISDIR="$( \cd "$(\dirname "$0")" && \pwd )"  # obtain the script's working directory.
 
 ############################
 
@@ -18,25 +14,28 @@ source "$WORKDIR/site_avenger.config"
 # check for parameters.
 app_dirname="$1"; shift
 
+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"
 
 # simplistic approach here; just go to the folder and pull the changes.
 
 pushd "$full_app_dir" &>/dev/null
-check_result "Changing to app path '$full_app_dir'"
+exit_on_error "Changing to app path '$full_app_dir'"
 
 dir="avenger5/vendor/siteavenger/avcore"
 if [ ! -d $dir ]; then
@@ -45,7 +44,7 @@ else
   pushd "$dir" &>/dev/null
 
   git pull
-  check_result "Pulling git repo for avcore under '$full_app_dir'"
+  exit_on_error "Pulling git repo for avcore under '$full_app_dir'"
 
   echo "Finished updating the avcore portion of site in ${app_dirname}."