From: Chris Koeritz <fred@gruntose.com>
Date: Wed, 15 Nov 2017 04:10:28 +0000 (-0500)
Subject: really close
X-Git-Tag: 2.140.100^2~11^2~9
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=83f7f5aa03a16586add004837d4ab4297c9fe4ab;p=feisty_meow.git

really close
---

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index 8f35a555..7b732160 100644
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -905,9 +905,6 @@ echo ongoing skip count is now $skip_count
 echo file we created looks like this:
 filedump "$new_version"
 
-echo bailing
-exit 1
-
     \mv "$new_version" "$filename"
     test_or_die "moving the new version into place in: $filename"
   }
diff --git a/scripts/system/common_sysadmin.sh b/scripts/system/common_sysadmin.sh
index 15e11270..d3dfbad1 100644
--- a/scripts/system/common_sysadmin.sh
+++ b/scripts/system/common_sysadmin.sh
@@ -118,7 +118,7 @@ function remove_subdomain()
   fi
 
   # see if subdomain already present in config.
-  if [ ! $(grep -q "$old_domain" "$domain_file") ]; then
+  if ! grep -q "$old_domain" "$domain_file"; then
     echo "The subdomain $subdomain is already missing from the domain"
     echo "configuration file: $domain_file"
     echo "Our work is apparently done for removing it."
@@ -150,7 +150,7 @@ function add_new_subdomain()
   fi
 
   # see if subdomain already present in config.
-  if [ $(grep -q "$new_domain" "$domain_file") ]; then
+  if grep -q "$new_domain" "$domain_file"; then
     echo "The subdomain $subdomain already seems to exist in the domain"
     echo "configuration file: $domain_file"
     echo "Please edit the config file to remove the subdomain before trying"