diff --git a/Scripts/Functions/Prepare/prepare.sh b/Scripts/Functions/Prepare/prepare.sh index d603586..2135b64 100755 --- a/Scripts/Functions/Prepare/prepare.sh +++ b/Scripts/Functions/Prepare/prepare.sh @@ -41,7 +41,7 @@ function prepare { local FLAG_ENVIRONMENT='false' # Interpret arguments and options passed through command-line. - prepare_getArguments + prepare_getOptions # Redefine positional parameters using ARGUMENTS. At this point, # option arguments have been removed from ARGUMENTS variable and @@ -52,7 +52,7 @@ function prepare { # centos-art, there are many different actions to perform based on # the option passed (e.g., `--packages', `--links', # `--environment', etc.). In that sake, we defined action name - # inside prepare_getArguments, at the moment of interpreting + # inside prepare_getOptions, at the moment of interpreting # options. # Define action value. There is no action value in this function, diff --git a/Scripts/Functions/Prepare/prepare_getArguments.sh b/Scripts/Functions/Prepare/prepare_getArguments.sh deleted file mode 100755 index 26b4fb1..0000000 --- a/Scripts/Functions/Prepare/prepare_getArguments.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/bash -# -# prepare_getArguments.sh -- This function interpretes arguments passed -# to `prepare' functionality and calls actions accordingly. -# -# Copyright (C) 2009-2011 Alain Reguera Delgado -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at -# your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# ---------------------------------------------------------------------- -# $Id$ -# ---------------------------------------------------------------------- - -function prepare_getArguments { - - # Define short options we want to support. - local ARGSS="" - - # Define long options we want to support. - local ARGSL="quiet,answer-yes,packages,links,environment" - - # Parse arguments using getopt(1) command parser. - cli_doParseArguments - - # Reset positional parameters using output from (getopt) argument - # parser. - eval set -- "$ARGUMENTS" - - # Look for options passed through command-line. - while true; do - case "$1" in - - --quiet ) - FLAG_QUIET="true" - FLAG_DONT_COMMIT_CHANGES="true" - shift 1 - ;; - - --answer-yes ) - FLAG_ANSWER="true" - shift 1 - ;; - - --packages ) - FLAG_PACKAGES="true" - shift 1 - ;; - - --links ) - FLAG_LINKS="true" - shift 1 - ;; - - --environment ) - FLAG_ENVIRONMENT="true" - shift 1 - ;; - - * ) - break - esac - done - -} diff --git a/Scripts/Functions/Prepare/prepare_getOptions.sh b/Scripts/Functions/Prepare/prepare_getOptions.sh new file mode 100755 index 0000000..e41d671 --- /dev/null +++ b/Scripts/Functions/Prepare/prepare_getOptions.sh @@ -0,0 +1,75 @@ +#!/bin/bash +# +# prepare_getOptions.sh -- This function interpretes option parameters +# passed to `prepare' functionality and calls actions accordingly. +# +# Copyright (C) 2009-2011 Alain Reguera Delgado +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# ---------------------------------------------------------------------- +# $Id$ +# ---------------------------------------------------------------------- + +function prepare_getOptions { + + # Define short options we want to support. + local ARGSS="" + + # Define long options we want to support. + local ARGSL="quiet,answer-yes,packages,links,environment" + + # Parse arguments using getopt(1) command parser. + cli_doParseArguments + + # Reset positional parameters using output from (getopt) argument + # parser. + eval set -- "$ARGUMENTS" + + # Look for options passed through command-line. + while true; do + case "$1" in + + --quiet ) + FLAG_QUIET="true" + FLAG_DONT_COMMIT_CHANGES="true" + shift 1 + ;; + + --answer-yes ) + FLAG_ANSWER="true" + shift 1 + ;; + + --packages ) + FLAG_PACKAGES="true" + shift 1 + ;; + + --links ) + FLAG_LINKS="true" + shift 1 + ;; + + --environment ) + FLAG_ENVIRONMENT="true" + shift 1 + ;; + + * ) + break + esac + done + +}