From f3c0a1693fbd8401db647c2b789430c2962a9051 Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: Sep 15 2012 22:45:18 +0000 Subject: Rename variable from `CLI_NAME' to `TCAR_CLI_NAME' inside all .sh script files. --- diff --git a/Scripts/Bash/Functions/Commons/cli_parseArguments.sh b/Scripts/Bash/Functions/Commons/cli_parseArguments.sh index 354c829..d62344a 100755 --- a/Scripts/Bash/Functions/Commons/cli_parseArguments.sh +++ b/Scripts/Bash/Functions/Commons/cli_parseArguments.sh @@ -29,7 +29,7 @@ function cli_parseArguments { eval set -- "$ARGUMENTS" # Parse optional arguments using getopt. - ARGUMENTS=$(getopt -o "$ARGSS" -l "$ARGSL" -n "$CLI_NAME (${FUNCNAME[1]})" -- "$@") + ARGUMENTS=$(getopt -o "$ARGSS" -l "$ARGSL" -n "$TCAR_CLI_NAME (${FUNCNAME[1]})" -- "$@") # Be sure getout parsed arguments successfully. if [[ $? != 0 ]]; then diff --git a/Scripts/Bash/Functions/Commons/cli_printMessage.sh b/Scripts/Bash/Functions/Commons/cli_printMessage.sh index 442e346..8a0972e 100755 --- a/Scripts/Bash/Functions/Commons/cli_printMessage.sh +++ b/Scripts/Bash/Functions/Commons/cli_printMessage.sh @@ -163,7 +163,7 @@ function cli_printMessage { local ORIGIN="$(caller 1 | gawk '{ print $2 " " $1 }')" # Build the error message. - cli_printMessage "${CLI_NAME} (${ORIGIN}): $MESSAGE" --as-stderr-line + cli_printMessage "${TCAR_CLI_NAME} (${ORIGIN}): $MESSAGE" --as-stderr-line cli_printMessage "${CLI_FUNCDIRNAM}" --as-toknowmore-line ;; diff --git a/Scripts/Bash/Functions/Commons/init.sh b/Scripts/Bash/Functions/Commons/init.sh index 507765a..998ac36 100755 --- a/Scripts/Bash/Functions/Commons/init.sh +++ b/Scripts/Bash/Functions/Commons/init.sh @@ -92,7 +92,7 @@ function init { # provided, execute the help functionality and end script # execution. if [[ ! "$1" ]] || [[ ! "$1" =~ '^[[:alpha:]]' ]];then - exec ${CLI_BASEDIR}/${CLI_NAME}.sh help + exec ${CLI_BASEDIR}/${TCAR_CLI_NAME}.sh help exit fi diff --git a/Scripts/Bash/Functions/Help/Texinfo/texinfo_makeSeeAlso.sh b/Scripts/Bash/Functions/Help/Texinfo/texinfo_makeSeeAlso.sh index 9126ee9..5f0434e 100755 --- a/Scripts/Bash/Functions/Help/Texinfo/texinfo_makeSeeAlso.sh +++ b/Scripts/Bash/Functions/Help/Texinfo/texinfo_makeSeeAlso.sh @@ -57,7 +57,7 @@ function texinfo_makeSeeAlso { fi # Define `SeeAlso' transltaion marker regular expression pattern. - TMARK_PATTERN="^@c -- <\[${CLI_NAME}\(SeeAlso(,(itemize|enumerate|menu))?\)$" + TMARK_PATTERN="^@c -- <\[${TCAR_CLI_NAME}\(SeeAlso(,(itemize|enumerate|menu))?\)$" # Retrive `SeeAlso' translation marker definition lines. Be sure # to retrive unique definitions only. If the same definition is @@ -112,7 +112,7 @@ function texinfo_makeSeeAlso { # markers that can provided and here we need to precisely set # the one being currently processed, not those whose could be # processed. - LIST_TYPE_PATTERN="^@c -- <\[${CLI_NAME}\(SeeAlso${LIST_PROP}\)$" + LIST_TYPE_PATTERN="^@c -- <\[${TCAR_CLI_NAME}\(SeeAlso${LIST_PROP}\)$" # Redefine list's entry based on translation marker definition. if [[ $LIST_TYPE =~ '^menu$' ]];then @@ -130,7 +130,7 @@ function texinfo_makeSeeAlso { fi # Define menu using menu nodes. - LIST_DEF="@c -- <[${CLI_NAME}(SeeAlso${LIST_PROP})\n@${LIST_TYPE}\n${LIST_ENTRIES}@end ${LIST_TYPE}\n@c -- ]>" + LIST_DEF="@c -- <[${TCAR_CLI_NAME}(SeeAlso${LIST_PROP})\n@${LIST_TYPE}\n${LIST_ENTRIES}@end ${LIST_TYPE}\n@c -- ]>" # Expand list definition using translation marker and list # definition itself. Be sure that no expansion be done when diff --git a/Scripts/Bash/Functions/Locale/locale_updateMessageMetadata.sh b/Scripts/Bash/Functions/Locale/locale_updateMessageMetadata.sh index 5cca196..b27380c 100755 --- a/Scripts/Bash/Functions/Locale/locale_updateMessageMetadata.sh +++ b/Scripts/Bash/Functions/Locale/locale_updateMessageMetadata.sh @@ -52,7 +52,7 @@ function locale_updateMessageMetadata { SRC[4]="\"PO-Revision-Date:" # Define replacement lines for pattern line. - DST[0]="\"Project-Id-Version: ${CLI_NAME}-${CLI_VERSION}\\\n\"" + DST[0]="\"Project-Id-Version: ${TCAR_CLI_NAME}-${CLI_VERSION}\\\n\"" DST[1]="\"Report-Msgid-Bugs-To: Documentation SIG <${MAILINGLIST_DOCS}>\\\n\"" DST[2]="\"Last-Translator: Documentation SIG\\\n\"" DST[3]="\"Language-Team: ${LANGNAME}\\\n\"" @@ -75,7 +75,7 @@ function locale_updateMessageMetadata { fi # Replace package information using gettext domain information. - sed -i -r "s/PACKAGE/${CLI_NAME}-${CLI_VERSION}/g" ${FILE} + sed -i -r "s/PACKAGE/${TCAR_CLI_NAME}-${CLI_VERSION}/g" ${FILE} # Remove absolute path to the working copy so it doesn't appear on # comments related to locations. Remember that people can download diff --git a/Scripts/Bash/Functions/Prepare/prepare_updateImages.sh b/Scripts/Bash/Functions/Prepare/prepare_updateImages.sh index 5edefae..9d96939 100755 --- a/Scripts/Bash/Functions/Prepare/prepare_updateImages.sh +++ b/Scripts/Bash/Functions/Prepare/prepare_updateImages.sh @@ -43,6 +43,6 @@ function prepare_updateImages { # the image preparation process, all images that need to hold # branding information will be rendered using The CentOS Brand in # it. - ${CLI_BASEDIR}/${CLI_NAME}.sh render $DIRS --dont-commit-changes --with-brands + ${CLI_BASEDIR}/${TCAR_CLI_NAME}.sh render $DIRS --dont-commit-changes --with-brands } diff --git a/Scripts/Bash/Functions/Prepare/prepare_updateLinks.sh b/Scripts/Bash/Functions/Prepare/prepare_updateLinks.sh index fe1e75e..b03c878 100755 --- a/Scripts/Bash/Functions/Prepare/prepare_updateLinks.sh +++ b/Scripts/Bash/Functions/Prepare/prepare_updateLinks.sh @@ -79,9 +79,9 @@ function prepare_updateLinks { done # Define link relation for cli. - LINKS_SRC[((++${#LINKS_SRC[*]}))]=${APPS_DIR}/${CLI_NAME} - LINKS_DST[((++${#LINKS_DST[*]}))]=${CLI_BASEDIR}/${CLI_NAME}.sh - USERFILES="${APPS_DIR}/${CLI_NAME}" + LINKS_SRC[((++${#LINKS_SRC[*]}))]=${APPS_DIR}/${TCAR_CLI_NAME} + LINKS_DST[((++${#LINKS_DST[*]}))]=${CLI_BASEDIR}/${TCAR_CLI_NAME}.sh + USERFILES="${APPS_DIR}/${TCAR_CLI_NAME}" # Define link relation for fonts. for FONT in $(cli_getFilesList "${WCDIR_FONTS}" --pattern='.+\.ttf');do diff --git a/Scripts/Bash/Functions/Prepare/prepare_updateLocales.sh b/Scripts/Bash/Functions/Prepare/prepare_updateLocales.sh index 4adbcce..c6d6a37 100755 --- a/Scripts/Bash/Functions/Prepare/prepare_updateLocales.sh +++ b/Scripts/Bash/Functions/Prepare/prepare_updateLocales.sh @@ -28,6 +28,6 @@ function prepare_updateLocales { - ${CLI_BASEDIR}/${CLI_NAME}.sh locale trunk/Scripts/Bash --update --dont-commit-changes + ${CLI_BASEDIR}/${TCAR_CLI_NAME}.sh locale trunk/Scripts/Bash --update --dont-commit-changes } diff --git a/Scripts/Bash/Functions/Prepare/prepare_updateManuals.sh b/Scripts/Bash/Functions/Prepare/prepare_updateManuals.sh index 5b49f51..b85a522 100755 --- a/Scripts/Bash/Functions/Prepare/prepare_updateManuals.sh +++ b/Scripts/Bash/Functions/Prepare/prepare_updateManuals.sh @@ -28,7 +28,7 @@ function prepare_updateManuals { # Render key documentation manuals. - ${CLI_BASEDIR}/${CLI_NAME}.sh render trunk/Documentation/Manuals/Docbook/Tcar-ug --dont-commit-changes - ${CLI_BASEDIR}/${CLI_NAME}.sh help trunk/Documentation/Manuals/Texinfo/Tcar-fs --update --dont-commit-changes + ${CLI_BASEDIR}/${TCAR_CLI_NAME}.sh render trunk/Documentation/Manuals/Docbook/Tcar-ug --dont-commit-changes + ${CLI_BASEDIR}/${TCAR_CLI_NAME}.sh help trunk/Documentation/Manuals/Texinfo/Tcar-fs --update --dont-commit-changes } diff --git a/Scripts/Bash/centos-art.sh b/Scripts/Bash/centos-art.sh index 6cc0f53..e1969dc 100755 --- a/Scripts/Bash/centos-art.sh +++ b/Scripts/Bash/centos-art.sh @@ -24,9 +24,9 @@ # Initialize script-specific configuration variables. declare -xr BRAND="centos" -declare -xr CLI_NAME="${BRAND}-art" +declare -xr TCAR_CLI_NAME="${BRAND}-art" declare -xr CLI_VERSION='1.0' -declare -xr CLI_TEMPDIR="$(mktemp -p /tmp -d ${CLI_NAME}.sh-XXXXXX)" +declare -xr CLI_TEMPDIR="$(mktemp -p /tmp -d ${TCAR_CLI_NAME}.sh-XXXXXX)" # Initialize working copy default value. if [[ ! $TCAR_WORKDIR ]] || [[ $TCAR_WORKDIR == "" ]];then @@ -39,7 +39,7 @@ declare -xr CLI_FUNCDIR="${CLI_BASEDIR}/Functions" # Initialize internazionalization through GNU gettext. . gettext.sh -declare -xr TEXTDOMAIN=${CLI_NAME}.sh +declare -xr TEXTDOMAIN=${TCAR_CLI_NAME}.sh declare -xr TEXTDOMAINDIR=${TCAR_WORKDIR}/trunk/Locales/Scripts/Bash # Initialize copyright information.