From bb4d488a14a05168a93a0b7fa57636e55a983360 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 15 Feb 2008 19:01:31 +0000 Subject: [PATCH] - let "./builder ./arts.spec" detect also sticky cvs branch Changed files: builder.sh -> 1.537 --- builder.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builder.sh b/builder.sh index 193fec4..92435cd 100644 --- a/builder.sh +++ b/builder.sh @@ -2195,10 +2195,10 @@ while [ $# -gt 0 ]; do -debug) RPMBUILDOPTS="${RPMBUILDOPTS} -debug"; shift ;; - -* ) + -*) Exit_error err_invalid_cmdline "$1" ;; - * ) + *) SPECFILE="${1}" # check if specname was passed as specname:cvstag if [ "${SPECFILE##*:}" != "${SPECFILE}" ]; then @@ -2211,7 +2211,7 @@ while [ $# -gt 0 ]; do done if [ -f CVS/Entries ] && [ -z "$CVSTAG" ]; then - CVSTAG=$(awk -vSPECFILE="${SPECFILE%.spec}.spec" -F/ '$2 == SPECFILE && $6 ~ /^T/{print substr($6, 2)}' CVS/Entries) + CVSTAG=$(awk -vSPECFILE=$(basename ${SPECFILE%.spec}.spec) -F/ '$2 == SPECFILE && $6 ~ /^T/{print substr($6, 2)}' CVS/Entries) if [ "$CVSTAG" ]; then echo >&2 "builder: Stick tag $CVSTAG active. Use -r TAGNAME to override." fi -- 2.44.0