really close

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index 8f35a5557a2698e5e6fca79f206ff40722abc338..7b732160a499458b374f0fd16b58835d0d72aba1 100644 (file)
--- 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 15e112707c67b864816e6e4d882394190ff2456a..d3dfbad1d5a793b9ff2f050aaa95d26ef337a0c5 100644 (file)
--- 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"