diff --git a/Scripts/Bash/Functions/cli.sh b/Scripts/Bash/Functions/cli.sh index ab49423..4bb1a1a 100644 --- a/Scripts/Bash/Functions/cli.sh +++ b/Scripts/Bash/Functions/cli.sh @@ -28,6 +28,12 @@ function cli { + # Initialize global variables. + local ACTION='' + local OPTIONNAM='' + local OPTIONVAL='' + local REGEX='' + # Define action variable using first argument (lowercase) value. ACTION=$(cli_getRepoName "$1" 'f') @@ -97,15 +103,6 @@ function cli { OPTIONVAL=$OPTIONVAL/$REGEX fi - # Define positive answer. - Y="`gettext "y"`" - - # Define negative answer. - N="`gettext "N"`" - - # Define default answer to questions. - ANSWER=${N} - # Define prefix for temporal files. TMPFILE="/tmp/centos-art-$$" diff --git a/Scripts/Bash/Functions/cli_printMessage.sh b/Scripts/Bash/Functions/cli_printMessage.sh index 2396923..eaa14fa 100755 --- a/Scripts/Bash/Functions/cli_printMessage.sh +++ b/Scripts/Bash/Functions/cli_printMessage.sh @@ -34,7 +34,10 @@ function cli_printMessage { # Define variables as local to avoid conflicts outside. local MESSAGE="$1" local FORMAT="$2" - + local Y='' + local N='' + local ANSWER='' + # Reduce paths inside output messages. The main purpose for this # is to free horizontal space in output messages. MESSAGE=$(echo "$MESSAGE" \ @@ -118,6 +121,16 @@ function cli_printMessage { ;; 'AsYesOrNoRequestLine' ) + # Define positive answer. + Y="`gettext "y"`" + + # Define negative answer. + N="`gettext "N"`" + + # Define default answer to questions. + ANSWER=${N} + + # Define `yes or no' confirmation question. echo -n "$MESSAGE [${Y}/${N}]: " read ANSWER if [[ ! $ANSWER =~ "^${Y}" ]];then