OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 02-Jun-2003 15:46:39
Branch: HEAD Handle: 2003060214463800
Modified files:
openpkg-re openpkg-dev
Log:
replace 'egrep -q' with shell redirection because it doesn't exists on
all platforms (e.g. Solaris)
Summary:
Revision Changes Path
1.112 +15 -15 openpkg-re/openpkg-dev
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/openpkg-dev
============================================================================
$ cvs diff -u -r1.111 -r1.112 openpkg-dev
--- openpkg-re/openpkg-dev 14 May 2003 18:57:21 -0000 1.111
+++ openpkg-re/openpkg-dev 2 Jun 2003 13:46:38 -0000 1.112
@@ -440,7 +440,7 @@
command=""
mode="clear"
else
- echo "$1" | egrep -q "^/"
+ echo "$1" | egrep "^/" >/dev/null 2>&1
if [ $? -eq 0 ]; then
# leading slash enters setup mode
execute="${1}"
@@ -501,8 +501,8 @@
[ ".${RV}" = . ] && return
# check for HEAD (branch) aka CURRENT (name)
- echo "CURRENT" | egrep -q "^${RV}" && RV="HEAD"
- echo "HEAD" | egrep -q "^${RV}" && RV="HEAD"
+ echo "CURRENT" | egrep "^${RV}" >/dev/null 2>&1 && RV="HEAD"
+ echo "HEAD" | egrep "^${RV}" >/dev/null 2>&1 && RV="HEAD"
if [ .${RV} != ".HEAD" ]; then
@@ -1008,7 +1008,7 @@
if [ ".${OPENPKG_MODE}" = .developer ]; then
# compatiblity FIXME
- echo "${OPENPKG_DIST}" | egrep -q "/current/SRC/?$"
+ echo "${OPENPKG_DIST}" | egrep "/current/SRC/?$" >/dev/null 2>&1
if [ $? -eq 0 ]; then
warn "deprecated suffix /current/src in
OPENPKG_DIST=${OPENPKG_DIST}."
warn "This might come from your ~/.openpkg-dev.rc file. Please fix."
@@ -1478,10 +1478,10 @@
case ".$1" in
.-D ) shift
opt="$1"
- pkg=""; echo "${opt}" | egrep -q '::' && pkg="`echo ${opt} | sed
-e 's;::.*$;;'`"
+ pkg=""; echo "${opt}" | egrep '::' >/dev/null 2>&1 && pkg="`echo
${opt} | sed -e 's;::.*$;;'`"
opt="`echo ${opt} | sed -e 's;^.*::;;'`"
- echo "${opt}" | egrep -q '^with_' || opt="with_${opt}"
- echo "${opt}" | egrep -q '=' || opt="${opt}=yes"
+ echo "${opt}" | egrep '^with_' >/dev/null 2>&1 ||
opt="with_${opt}"
+ echo "${opt}" | egrep '=' >/dev/null 2>&1 || opt="${opt}=yes"
if [ ".${pkg}" = . ]; then
defall="${defall} ${opt}"
else
@@ -1587,9 +1587,9 @@
all="${packages}"
fi
for name in $all; do
- echo "$name" | egrep -q "^[./]+"
+ echo "$name" | egrep "^[./]+" >/dev/null 2>&1
if [ $? -ne 0 ]; then
- echo "$name" | egrep -q "/"
+ echo "$name" | egrep "/" >/dev/null 2>&1
if [ $? -eq 0 ]; then
name="${OPENPKG_WORK}/src/$name"
else
@@ -1685,9 +1685,9 @@
fi
for name in $all; do
- echo "$name" | egrep -q "^[./]+"
+ echo "$name" | egrep "^[./]+" >/dev/null 2>&1
if [ $? -ne 0 ]; then
- echo "$name" | egrep -q "/"
+ echo "$name" | egrep "/" >/dev/null 2>&1
if [ $? -eq 0 ]; then
name="${OPENPKG_WORK}/src/$name"
else
@@ -1752,9 +1752,9 @@
fi
for name in $all; do
- echo "$name" | egrep -q "^[./]+"
+ echo "$name" | egrep "^[./]+" >/dev/null 2>&1
if [ $? -ne 0 ]; then
- echo "$name" | egrep -q "/"
+ echo "$name" | egrep "/" >/dev/null 2>&1
if [ $? -eq 0 ]; then
name="${OPENPKG_WORK}/src/$name"
else
@@ -1816,9 +1816,9 @@
fi
for name in $all; do
- echo "$name" | egrep -q "^[./]+"
+ echo "$name" | egrep "^[./]+" >/dev/null 2>&1
if [ $? -ne 0 ]; then
- echo "$name" | egrep -q "/"
+ echo "$name" | egrep "/" >/dev/null 2>&1
if [ $? -eq 0 ]; then
name="${OPENPKG_WORK}/src/$name"
else
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
