From 5e79c9c5e2106a24fa597003379ba2379c7620b7 Mon Sep 17 00:00:00 2001 From: Andy Witter Date: Thu, 10 Jul 2014 15:12:50 -0400 Subject: [PATCH] Fix bug: Asking for prefix when no-prefix was selected when not using a config file. --- GenaSYS.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/GenaSYS.sh b/GenaSYS.sh index 588a5bc..fd40333 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.33" - DATE_="2010-09-23; last update: 2014-05-19" + VERSION_="1.34" + DATE_="2010-09-23; last update: 2014-07-08" AUTHOR_="Andy Witter " URL_="http://evergreen-ils.org" CATEGORY_="devel" @@ -474,7 +474,6 @@ while true; do echo -en $COL_BR_CYAN read -n 1 -p "[y/n] :" GENERATE_BRICKS_IPS echo -e $COL_RESET -echo generate bricks ips: $GENERATE_BRICKS_IPS case $GENERATE_BRICKS_IPS in [Yy]* ) echo ; break;; [Nn]* ) echo ; break;; @@ -482,7 +481,6 @@ echo generate bricks ips: $GENERATE_BRICKS_IPS esac done -echo generate bricks ips: $GENERATE_BRICKS_IPS } Get_Brick_IP_Addresses () { ### Get IP addresses for the bricks. @@ -1047,9 +1045,12 @@ Write_Config_File CLUSTERDOMAINNAME ### Prompt to get hostname prefix -if [ -z "$HOSTNAME_PREFIX" ] || [ "$USE_CONFIG_FILE" == "0" ] +if [ -z "$USE_HOSTNAME_PREFIX" ] || [ "$USE_CONFIG_FILE" == "0" ] +then + if [ -z "$HOSTNAME_PREFIX" ] || [ "$USE_CONFIG_FILE" == "0" ] then Get_Hostname_Prefix + fi fi Write_Config_File USE_HOSTNAME_PREFIX Write_Config_File HOSTNAME_PREFIX -- 2.11.0