From e788066bafd273020af7b487b21ebdfcbb344c6d Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: Sep 09 2012 01:28:15 +0000 Subject: Update `trunk/Scripts/Bash/Functions/Commons/cli_getRepoTLDir.sh' file. --- diff --git a/Scripts/Bash/Functions/Commons/cli_getRepoTLDir.sh b/Scripts/Bash/Functions/Commons/cli_getRepoTLDir.sh index ba2e7ad..0f5495a 100755 --- a/Scripts/Bash/Functions/Commons/cli_getRepoTLDir.sh +++ b/Scripts/Bash/Functions/Commons/cli_getRepoTLDir.sh @@ -2,8 +2,8 @@ # # cli_getRepoTLDir.sh -- This function returns the repository top # level absolute path. The repository top level absolute path can be -# either ${CLI_WRKCOPY}/trunk, ${CLI_WRKCOPY}/branches, or -# ${CLI_WRKCOPY}/tags. +# either ${TCAR_WORKDIR}/trunk, ${TCAR_WORKDIR}/branches, or +# ${TCAR_WORKDIR}/tags. # # Copyright (C) 2009, 2010, 2011, 2012 The CentOS Project # @@ -57,7 +57,7 @@ function cli_getRepoTLDir { # passed as non-option argument to this function, then set the # trunk directory structure as default location. if [[ $LOCATION =~ '--$' ]];then - LOCATION=${CLI_WRKCOPY}/trunk + LOCATION=${TCAR_WORKDIR}/trunk fi # Verify location where the working copy should be stored in the @@ -65,7 +65,7 @@ function cli_getRepoTLDir { # to one of the top level directories inside the working copy of # CentOS Artwork Repository which, in turn, should be sotred in # the `artwork' directory immediatly under your home directory. - if [[ ! $LOCATION =~ "^${CLI_WRKCOPY}/(trunk|branches|tags)" ]];then + if [[ ! $LOCATION =~ "^${TCAR_WORKDIR}/(trunk|branches|tags)" ]];then cli_printMessage "`eval_gettext "The location \\\"\\\$LOCATION\\\" is not valid."`" --as-error-line fi @@ -75,14 +75,14 @@ function cli_getRepoTLDir { case "$1" in -r|--relative ) - PATTERN="^${CLI_WRKCOPY}/(trunk|branches|tags)/.+$" + PATTERN="^${TCAR_WORKDIR}/(trunk|branches|tags)/.+$" REPLACE='\1' shift 2 break ;; -- ) - PATTERN="^(${CLI_WRKCOPY}/(trunk|branches|tags))/.+$" + PATTERN="^(${TCAR_WORKDIR}/(trunk|branches|tags))/.+$" REPLACE='\1' shift 1 break