[commit: Cabal] master: Don't use grep -e, solaris does not like it (c3237ef)
Ian Lynagh
igloo at earth.li
Fri Jun 24 02:02:10 CEST 2011
Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/c3237effed02993b9636513221570a41baa05068
>---------------------------------------------------------------
commit c3237effed02993b9636513221570a41baa05068
Author: Duncan Coutts <duncan at haskell.org>
Date: Fri Jan 23 16:04:43 2009 +0000
Don't use grep -e, solaris does not like it
>---------------------------------------------------------------
cabal-install/bootstrap.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cabal-install/bootstrap.sh b/cabal-install/bootstrap.sh
index ec49b35..8fee1c2 100644
--- a/cabal-install/bootstrap.sh
+++ b/cabal-install/bootstrap.sh
@@ -36,7 +36,7 @@ die () {
}
# Check we're in the right directory:
-grep -e "cabal-install" ./cabal-install.cabal > /dev/null \
+grep "cabal-install" ./cabal-install.cabal > /dev/null \
|| die "The bootstrap.sh script must be run in the cabal-install directory"
GHC_VER=`${GHC} --numeric-version`
@@ -53,7 +53,7 @@ ${GHC_PKG} list > ghc-pkg.list \
need_pkg () {
PKG=$1
VER_MATCH=$2
- if grep -e " ${PKG}-${VER_MATCH}" ghc-pkg.list > /dev/null
+ if grep " ${PKG}-${VER_MATCH}" ghc-pkg.list > /dev/null
then
return 1
else
More information about the Cvs-libraries
mailing list