RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 24-Jul-2007 17:16:45
Branch: HEAD Handle: 2007072416164500
Modified files:
rpm devtool.conf
Log:
there are too many Unix which(1) out there, so change the negative
filter to a positive filter as this has more chance to work everywhere
Summary:
Revision Changes Path
2.74 +9 -9 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.73 -r2.74 devtool.conf
--- rpm/devtool.conf 24 Jul 2007 12:37:29 -0000 2.73
+++ rpm/devtool.conf 24 Jul 2007 15:16:45 -0000 2.74
@@ -237,7 +237,7 @@
if [ ".$val" = .set ]; then
eval "$tool=\"\${$variable}\""
else
- if [ ".`(which $tool) 2>/dev/null | grep -v '^no'`" != . ]; then
+ if [ ".`(which $tool) 2>/dev/null | egrep '^/'`" != . ]; then
eval "$tool=\"$tool\""
else
echo "devtool:ERROR: sorry, \"$tool\" required in \$PATH (or
set \$$variable)" 1>&2
@@ -251,17 +251,17 @@
# chain is built with the same one in order to avoid incompatibilities)
if [ ".$CC" != . ]; then
cc="$CC"
- elif [ ".`(which gcc) 2>/dev/null | grep -v '^no'`" != . ]; then
+ elif [ ".`(which gcc) 2>/dev/null | egrep '^/'`" != . ]; then
cc="gcc"
- elif [ ".`(which icc) 2>/dev/null | grep -v '^no'`" != . ]; then
+ elif [ ".`(which icc) 2>/dev/null | egrep '^/'`" != . ]; then
cc="icc"
- elif [ ".`(which cc) 2>/dev/null | grep -v '^no'`" != . ]; then
+ elif [ ".`(which cc) 2>/dev/null | egrep '^/'`" != . ]; then
cc="cc"
else
echo "devtool:ERROR: sorry, C compiler (\"cc\") required in \$PATH
(or set \$CC)" 1>&2
exit 1
fi
- if [ ".`(which ccache) 2>/dev/null | grep -v '^no'`" != . ]; then
+ if [ ".`(which ccache) 2>/dev/null | egrep '^/'`" != . ]; then
cc="ccache $cc"
fi
@@ -274,13 +274,13 @@
name=`echo "$file" | sed -e 's;^.*/\([^/]*\)$;\1;'`
for url in `echo "$2" | sed -e 's/,/ /g'`; do
echo "-- downloading $url$name"
- if [ ".`(which curl) 2>/dev/null | grep -v '^no'`" != . ]; then
+ if [ ".`(which curl) 2>/dev/null | egrep '^/'`" != . ]; then
curl -s -o "$file" "$url$name" || continue
- elif [ ".`(which wget) 2>/dev/null | grep -v '^no'`" != . ]; then
+ elif [ ".`(which wget) 2>/dev/null | egrep '^/'`" != . ]; then
wget -q -O "$file" "$url$name" || continue
- elif [ ".`(which fetch) 2>/dev/null | grep -v '^no'`" != . ];
then
+ elif [ ".`(which fetch) 2>/dev/null | egrep '^/'`" != . ]; then
fetch -o "$file" "$url$name" || continue
- elif [ ".`(which lwp-download) 2>/dev/null | grep -v '^no'`" !=
. ]; then
+ elif [ ".`(which lwp-download) 2>/dev/null | egrep '^/'`" != .
]; then
lwp-download "$url$name" "$file" || continue
else
echo "devtool:ERROR: sorry, no download tool found in \$PATH
(\"curl\", \"wget\", \"fetch\", \"lwp-download\")" 1>&2
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
