OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 01-Apr-2003 17:34:29
Branch: HEAD Handle: 2003040116342900
Modified files:
openpkg-re openpkg-dev
Log:
be less demanding when selecting a reasonable bash
Summary:
Revision Changes Path
1.83 +7 -4 openpkg-re/openpkg-dev
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/openpkg-dev
============================================================================
$ cvs diff -u -r1.82 -r1.83 openpkg-dev
--- openpkg-re/openpkg-dev 1 Apr 2003 15:16:23 -0000 1.82
+++ openpkg-re/openpkg-dev 1 Apr 2003 15:34:29 -0000 1.83
@@ -833,10 +833,13 @@
fi
# find reasonable Bash
- if [ -f "${OPENPKG_INST}/bin/bash" ]; then
- bash="${OPENPKG_INST}/bin/bash"
- elif [ -f "${OPENPKG_INST}/lib/openpkg/bash" ]; then
- bash="${OPENPKG_INST}/lib/openpkg/bash"
+ matchinstance "" any
+ if [ -f "${RV}/bin/bash" ]; then
+ bash="${RV}/bin/bash"
+ elif [ -f "${RV}/lib/openpkg/bash" ]; then
+ bash="${RV}/lib/openpkg/bash"
+ elif [ -f "`which bash`" ]; then
+ bash="`which bash`"
else
die "no \"bash\" found in OpenPKG instance"
fi
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
