X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Fteardown.sh;h=13d4b3a9397a6172cc4993522ea45cae95956cdf;hb=baf5d7c693e351bd775114380dc0111bc3e4028e;hp=68fa0e14e979bfd32b283d05539359df92d989ef;hpb=9f3e83fc4e946639c89eeb37b54c21ecc4f40425;p=feisty_meow.git diff --git a/scripts/site_avenger/teardown.sh b/scripts/site_avenger/teardown.sh index 68fa0e14..13d4b3a9 100644 --- a/scripts/site_avenger/teardown.sh +++ b/scripts/site_avenger/teardown.sh @@ -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