Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.94

[feisty_meow.git] / scripts / system / add_domain.sh

diff --git a/scripts/system/add_domain.sh b/scripts/system/add_domain.sh
index 0dabaf2e7b4234392fe214883a4fdd6c3e07e94b..3c9df992983372a976865d7e91039c87b5f2d145 100644 (file)
--- a/scripts/system/add_domain.sh
+++ b/scripts/system/add_domain.sh
@@ -33,11 +33,13 @@ 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 "Please remove this file before proceeding, if it is junk.  For example:"
-    echo "  sudo rm $domain_file"
-    exit 1
+    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
 
   echo "
@@ -130,7 +132,7 @@ function restart_bind()
 
 # main body of script.
 
-if (( $EUID != 0 )); then
+if [[ $EUID != 0 ]]; then
   echo "This script must be run as root or sudo."
   exit 1
 fi