From: hno <> Date: Sat, 19 Oct 2002 03:22:58 +0000 (+0000) Subject: Adjust for squid3 module X-Git-Tag: SQUID_3_0_PRE1~632 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e14c0072a51d18607657b16d80887808ad228a23;p=thirdparty%2Fsquid.git Adjust for squid3 module --- diff --git a/mkrelease.sh b/mkrelease.sh index 58ae366776..326464f30d 100755 --- a/mkrelease.sh +++ b/mkrelease.sh @@ -4,6 +4,7 @@ if [ $# -ne 1 -a $# -ne 2 ]; then exit 1 fi package=squid +module=squid3 rev=`echo $1 | sed -e "s/^${package}-//"` name=${package}-${rev} tag=`echo ${name} | tr a-z.- A-Z__` @@ -19,9 +20,9 @@ export CVSROOT rm -rf $name.tar.gz $tmpdir trap "rm -rf $tmpdir" 0 -cvs -Q export -d $tmpdir -r $tag $package +cvs -Q export -d $tmpdir -r $tag $module if [ ! -f $tmpdir/configure ]; then - echo "ERROR! Tag $tag not found in $package" + echo "ERROR! Tag $tag not found in $module" fi cd $tmpdir diff --git a/mksnapshot.sh b/mksnapshot.sh index 38cd062402..e47788cf8f 100755 --- a/mksnapshot.sh +++ b/mksnapshot.sh @@ -3,12 +3,12 @@ if [ $# -gt 1 ]; then echo "Usage: $0 [branch]" exit 1 fi -package=squid +module=squid3 tag=${1:-HEAD} startdir=$PWD date=`env TZ=GMT date +%Y%m%d` -tmpdir=$PWD/${package}-${tag}-mksnapshot +tmpdir=$PWD/${module}-${tag}-mksnapshot CVSROOT=${CVSROOT:-/server/cvs-server/squid} export CVSROOT @@ -17,9 +17,9 @@ rm -rf $tmpdir trap "rm -rf $tmpdir" 0 rm -f ${tag}.out -cvs -Q export -d $tmpdir -r $tag $package +cvs -Q export -d $tmpdir -r $tag $module if [ ! -f $tmpdir/configure ]; then - echo "ERROR! Tag $tag not found in $package" + echo "ERROR! Tag $tag not found in $module" fi cd $tmpdir @@ -47,6 +47,6 @@ echo ${PACKAGE}-${VERSION}-${date}.tar.bz2 >>${tag}.out if (echo $VERSION | grep PRE) || (echo $VERSION | grep STABLE); then echo "Differences from ${PACKAGE}-${VERSION} to ${PACKAGE}-${VERSION}-${date}" >${PACKAGE}-${VERSION}-${date}.diff - cvs -q rdiff -u -r SQUID_`echo $VERSION | tr .- __` -r $tag $package >>${PACKAGE}-${VERSION}-${date}.diff + cvs -q rdiff -u -r SQUID_`echo $VERSION | tr .- __` -r $tag $module >>${PACKAGE}-${VERSION}-${date}.diff echo ${PACKAGE}-${VERSION}-${date}.diff >>${tag}.out fi