From: Andy Witter <awitter@georgialibraries.org>
Date: Tue, 17 Nov 2015 14:48:02 +0000 (-0500)
Subject: Fix bug #65 blank monitor admin password loop
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0f5332f0e378210bbc4abeaef52db11c16e7e744;p=contrib%2Fpines%2Fgenasys.git

Fix bug #65 blank monitor admin password loop
---

diff --git a/GenaSYS.sh b/GenaSYS.sh
index b0a12bf..414a22f 100755
--- a/GenaSYS.sh
+++ b/GenaSYS.sh
@@ -25,8 +25,8 @@
     PURPOSE_="Generate config files needed for Evergreen-ILS Cluster"
    SYNOPSIS_="$NAME_"
    REQUIRES_="standard GNU commands, apt, dpkg"
-    VERSION_="1.53"
-       DATE_="2010-09-23; last update: 2015-09-30"
+    VERSION_="1.54"
+       DATE_="2010-11-23; last update: 2015-11-17"
      AUTHOR_="Andy Witter <awitter@georgialibraries.org>"
         URL_="http://evergreen-ils.org"
    CATEGORY_="devel"
@@ -977,14 +977,14 @@ echo "we need to configure the admin credentials"
 echo "(icingaadmin, and muninadmin)"
 echo
 read -sp "Enter a password for (icingaadmin and muninadmin): " MONITOR_ADMIN_PASSWORD
-echo
-read -sp "Confirm password for (icingaadmin and muninadmin): " MONITOR_ADMIN_PASSWORD_CONFIRM
-while [[ "$MONITOR_ADMIN_PASSWORD_CONFIRM" == "" || "$MONITOR_ADMIN_PASSWORD" == "" ]]
+while [ "$MONITOR_ADMIN_PASSWORD_CONFIRM" == "" ]
         do
         echo -e $COL_BR_RED"Cannot be blank you must enter a password"$COL_RESET
         read -sp "Enter the Monitoring Administrator Password: " MONITOR_ADMIN_PASSWORD_CONFIRM
 done
 echo
+read -sp "Confirm password for (icingaadmin and muninadmin): " MONITOR_ADMIN_PASSWORD_CONFIRM
+echo
 }
 
 Get_Notification_Email () {