X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Fteardown.sh;h=c332986a8931008d36c667487c9da0268b2f0e25;hb=d767c155175d1de753856af6d4dc7edde815129d;hp=68fa0e14e979bfd32b283d05539359df92d989ef;hpb=2e93c29a45ae9d58694c0de962151e6829739380;p=feisty_meow.git

diff --git a/scripts/site_avenger/teardown.sh b/scripts/site_avenger/teardown.sh
index 68fa0e14..c332986a 100644
--- a/scripts/site_avenger/teardown.sh
+++ b/scripts/site_avenger/teardown.sh
@@ -47,7 +47,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
@@ -56,18 +56,18 @@ 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"
 
 sep
 
 sudo bash "$FEISTY_MEOW_SCRIPTS/system/remove_apache_site.sh" "$DOMAIN_NAME"
-test_or_die "dropping apache site for: $DOMAIN_NAME"
+exit_on_error "dropping apache site for: $DOMAIN_NAME"
 
 # drop the shadow site too.
 shadow_domain="${APPLICATION_NAME}.cakelampvm.com"
 if [ "$shadow_domain" != "$DOMAIN_NAME" ]; then
   sudo bash "$FEISTY_MEOW_SCRIPTS/system/remove_apache_site.sh" "$shadow_domain"
-  test_or_die "dropping shadow apache site on '$shadow_domain'"
+  exit_on_error "dropping shadow apache site on '$shadow_domain'"
 fi
 
 sep
@@ -75,7 +75,7 @@ sep
 #echo "!! domain being removed is: $DOMAIN_NAME"
 
 sudo bash "$FEISTY_MEOW_SCRIPTS/system/remove_domain.sh" "$DOMAIN_NAME"
-test_or_die "dropping domain: $DOMAIN_NAME"
+exit_on_error "dropping domain: $DOMAIN_NAME"
 
 sep