X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Favcoreup.sh;h=437e5134ded32cfc9dfd4e5c870a8a5daa547293;hb=refs%2Fheads%2Frelease-2.140.132;hp=106c1fd3ef76be3234ac92d7a03637ddb180c240;hpb=2e93c29a45ae9d58694c0de962151e6829739380;p=feisty_meow.git

diff --git a/scripts/site_avenger/avcoreup.sh b/scripts/site_avenger/avcoreup.sh
index 106c1fd3..437e5134 100644
--- a/scripts/site_avenger/avcoreup.sh
+++ b/scripts/site_avenger/avcoreup.sh
@@ -18,7 +18,7 @@ source "$THISDIR/shared_site_mgr.sh"
 
 sep
 
-check_apps_root "$BASE_APPLICATION_PATH"
+check_apps_root "$app_dirname"
 
 # find proper webroot where the site will be initialized.
 if [ -z "$app_dirname" ]; then
@@ -27,7 +27,7 @@ if [ -z "$app_dirname" ]; then
 else
   test_app_folder "$BASE_APPLICATION_PATH" "$app_dirname"
 fi
-test_or_die "finding and testing app folder"
+exit_on_error "finding and testing app folder"
 
 # where we expect to find our checkout folder underneath.
 full_app_dir="$BASE_APPLICATION_PATH/$app_dirname"
@@ -35,16 +35,16 @@ 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_die "Changing to app path '$full_app_dir'"
+exit_on_error "Changing to app path '$full_app_dir'"
 
-dir="avenger5/vendor/siteavenger/avcore"
+dir="$CHECKOUT_DIR_NAME/vendor/siteavenger/avcore"
 if [ ! -d $dir ]; then
   echo "The application doesn't seem to use avcore: $full_app_dir"
 else
   pushd "$dir" &>/dev/null
 
   git pull
-  test_or_die "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}."