From: Chris Koeritz <fred@gruntose.com>
Date: Sun, 12 Nov 2017 05:43:34 +0000 (-0500)
Subject: working towards goodness
X-Git-Tag: 2.140.98^2~4^2~20^2~3
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=bfc161f727cbf276292b727c6ac88560dbee26e8;p=feisty_meow.git

working towards goodness

turns out the script config system for site avenger scripts wasn't
working yet after all, since it was never tested.  kind of expected that
would be the case.  now working to fix some bugs.
---

diff --git a/scripts/site_avenger/standup.sh b/scripts/site_avenger/standup.sh
index e3cf02c6..bc109031 100644
--- a/scripts/site_avenger/standup.sh
+++ b/scripts/site_avenger/standup.sh
@@ -56,9 +56,13 @@ check_application_dir "$APPLICATION_DIR"
 add_domain "$DOMAIN_NAME"
 test_or_die "Setting up domain: $DOMAIN_NAME"
 
+sep
+
 add_apache_site "$APPLICATION_NAME" "$DOMAIN_NAME"
 test_or_die "Setting up apache site for: $APPLICATION_NAME"
 
+sep
+
 powerup "$APPLICATION_NAME" "$REPO_NAME" "$THEME_NAME"
 
 sep
diff --git a/scripts/system/add_apache_site.sh b/scripts/system/add_apache_site.sh
index e99f371a..6be31c8c 100644
--- a/scripts/system/add_apache_site.sh
+++ b/scripts/system/add_apache_site.sh
@@ -24,9 +24,9 @@ function write_apache_config()
   if [ -f "$site_config" ]; then
     echo "The apache configuration file already exists at:"
     echo "  $site_config"
-    echo "Please remove this file before proceeding, if it is junk.  For example:"
-    echo "  sudo rm $site_config"
-    exit 1
+    echo "Since apache configuration files can get very complex, we do not want to"
+    echo "assume that this file is removable.  Calling the site addition done."
+    exit 0
   fi
 
   echo "Creating a new apache2 site for $sitename with config file:"
diff --git a/scripts/system/add_domain.sh b/scripts/system/add_domain.sh
index b40cdc57..e0a6fb48 100644
--- a/scripts/system/add_domain.sh
+++ b/scripts/system/add_domain.sh
@@ -33,10 +33,12 @@ function write_new_domain_file()
   echo "using the config file: $domain_file"
 
   if [ -f $domain_file ]; then
+    echo
     echo "The domain configuration file already exists at:"
     echo "  $domain_file"
     echo "Since we don't want to tear that down if it has specialized configuration"
     echo "data in it, we will just leave it in place and consider our job done."
+    echo
     exit 0
   fi