diff --git a/Scripts/Functions/Help/Texinfo/texinfo.sh b/Scripts/Functions/Help/Texinfo/texinfo.sh index da6c6b4..87da2f3 100755 --- a/Scripts/Functions/Help/Texinfo/texinfo.sh +++ b/Scripts/Functions/Help/Texinfo/texinfo.sh @@ -37,7 +37,7 @@ function texinfo { # Define absolute path to template directory. This is the place # where we store locale directories (e.g., en_US, es_ES, etc.) # used to build manuals in texinfo format. - MANUAL_TEMPLATE=${FUNCDIR}/${FUNCDIRNAM}/$(cli_getRepoName \ + MANUAL_TEMPLATE=${CLI_FUNCDIR}/${CLI_FUNCDIRNAM}/$(cli_getRepoName \ ${FLAG_BACKEND} -d)/Templates # Define absolute path to language-specific template directory. diff --git a/Scripts/Functions/Help/help.sh b/Scripts/Functions/Help/help.sh index f38b1cf..e6f7a5d 100755 --- a/Scripts/Functions/Help/help.sh +++ b/Scripts/Functions/Help/help.sh @@ -85,7 +85,7 @@ function help { # we load all functionalities required into `centos-art.sh''s # execution environment and make them available, this way, to # perform backend-specific documentation tasks. - cli_exportFunctions "${FUNCDIR}/${FUNCDIRNAM}/$(cli_getRepoName \ + cli_exportFunctions "${CLI_FUNCDIR}/${CLI_FUNCDIRNAM}/$(cli_getRepoName \ ${FLAG_BACKEND} -d)" "${FLAG_BACKEND}" # Execute backend-specific documentation tasks for each diff --git a/Scripts/Functions/Prepare/prepare.sh b/Scripts/Functions/Prepare/prepare.sh index 65bd121..c87f4f9 100755 --- a/Scripts/Functions/Prepare/prepare.sh +++ b/Scripts/Functions/Prepare/prepare.sh @@ -32,7 +32,7 @@ function prepare { # Define absolute path to directory holding prepare's # configuration files. - local PREPARE_CONFIG_DIR=${FUNCDIR}/${FUNCDIRNAM}/Config + local PREPARE_CONFIG_DIR=${CLI_FUNCDIR}/${CLI_FUNCDIRNAM}/Config # Interpret arguments and options passed through command-line. ${CLI_FUNCNAME}_getOptions diff --git a/Scripts/Functions/Render/render.sh b/Scripts/Functions/Render/render.sh index 024908f..6678ef9 100755 --- a/Scripts/Functions/Render/render.sh +++ b/Scripts/Functions/Render/render.sh @@ -72,7 +72,7 @@ function render { # Initialize absolute path to backend's base directory, the place # where backend-specific directories are stored in. - local RENDER_BACKEND_DIR="${FUNCDIR}/${FUNCDIRNAM}" + local RENDER_BACKEND_DIR="${CLI_FUNCDIR}/${CLI_FUNCDIRNAM}" # Initialize list of supported file extensions. These file # extensions are used by design model files, the files used as diff --git a/Scripts/Functions/Tuneup/tuneup.sh b/Scripts/Functions/Tuneup/tuneup.sh index 569704a..029d05b 100755 --- a/Scripts/Functions/Tuneup/tuneup.sh +++ b/Scripts/Functions/Tuneup/tuneup.sh @@ -36,7 +36,7 @@ function tuneup { # Initialize absolute path to backend's base directory, the place # where backend-specific directories are stored in. - local TUNEUP_BACKEND_DIR="${FUNCDIR}/${FUNCDIRNAM}" + local TUNEUP_BACKEND_DIR="${CLI_FUNCDIR}/${CLI_FUNCDIRNAM}" # Initialize list of supported file extensions. This is, the file # extensions we want to perform maintainance tasks for. diff --git a/Scripts/Functions/cli.sh b/Scripts/Functions/cli.sh index b692693..88a3010 100755 --- a/Scripts/Functions/cli.sh +++ b/Scripts/Functions/cli.sh @@ -29,8 +29,8 @@ function cli { # Initialize global variables. local CLI_FUNCNAME='' - local FUNCDIR='' - local FUNCDIRNAM='' + local CLI_FUNCDIR='' + local CLI_FUNCDIRNAM='' local FUNCSCRIPT='' local ARGUMENTS='' @@ -60,9 +60,9 @@ function cli { # Redefine ARGUMENTS variable using current positional parameters. cli_parseArgumentsReDef "$@" - # Define function directory (FUNCDIR). The directory path where + # Define function directory (CLI_FUNCDIR). The directory path where # functionalities are stored inside the repository. - FUNCDIR=${CLI_BASEDIR}/Functions + CLI_FUNCDIR=${CLI_BASEDIR}/Functions # Check function name. The function name is critical for # centos-art.sh script to do something coherent. If it is not @@ -79,10 +79,10 @@ function cli { CLI_FUNCNAME=$(cli_getRepoName $1 -f) # Define function directory. - FUNCDIRNAM=$(cli_getRepoName $CLI_FUNCNAME -d) + CLI_FUNCDIRNAM=$(cli_getRepoName $CLI_FUNCNAME -d) # Define function file name. - FUNCSCRIPT=${FUNCDIR}/${FUNCDIRNAM}/${CLI_FUNCNAME}.sh + FUNCSCRIPT=${CLI_FUNCDIR}/${CLI_FUNCDIRNAM}/${CLI_FUNCNAME}.sh # Check function script execution rights. cli_checkFiles "${FUNCSCRIPT}" --execution @@ -105,7 +105,7 @@ function cli { # Go for function initialization. Keep the cli_exportFunctions # function calling after all variables and arguments definitions. - cli_exportFunctions "${FUNCDIR}/${FUNCDIRNAM}" + cli_exportFunctions "${CLI_FUNCDIR}/${CLI_FUNCDIRNAM}" # Execute function. eval $CLI_FUNCNAME diff --git a/Scripts/Functions/cli_parseArguments.sh b/Scripts/Functions/cli_parseArguments.sh index e4df4d6..8ece9ac 100755 --- a/Scripts/Functions/cli_parseArguments.sh +++ b/Scripts/Functions/cli_parseArguments.sh @@ -33,7 +33,7 @@ function cli_parseArguments { # Be sure getout parsed arguments successfully. if [[ $? != 0 ]]; then - cli_printMessage "${FUNCDIRNAM}" --as-toknowmore-line + cli_printMessage "${CLI_FUNCDIRNAM}" --as-toknowmore-line fi } diff --git a/Scripts/Functions/cli_printMessage.sh b/Scripts/Functions/cli_printMessage.sh index ba440fd..d12c014 100755 --- a/Scripts/Functions/cli_printMessage.sh +++ b/Scripts/Functions/cli_printMessage.sh @@ -152,7 +152,7 @@ function cli_printMessage { # Build the error message. cli_printMessage "${CLI_PROGRAM} (${ORIGIN}): $MESSAGE" --as-stderr-line - cli_printMessage "${FUNCDIRNAM}" --as-toknowmore-line + cli_printMessage "${CLI_FUNCDIRNAM}" --as-toknowmore-line ;; --as-toknowmore-line )