diff options
| author | Manoj Srivastava <srivasta@debian.org> | 2008-05-30 14:13:30 -0500 |
|---|---|---|
| committer | Manoj Srivastava <srivasta@debian.org> | 2008-05-30 14:13:30 -0500 |
| commit | fcfe3f145944eb93270f8c4d301313364e1f30b2 (patch) | |
| tree | 378d1e978b67c2c78904a81b454d303def969a97 /mcon/U/sh.U | |
| parent | e65bb46f249ce0cb16f71814f8b542eea87a8a82 (diff) | |
| parent | 6ed168ff814db8f9bcaad6f2e218fb2bbacbdb1c (diff) | |
Merge branch 'upstream' into topic--debian
Conflicts:
jmake/files/Jmake.rules
mcon/U/Chk_MANI.U
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
Diffstat (limited to 'mcon/U/sh.U')
| -rw-r--r-- | mcon/U/sh.U | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/mcon/U/sh.U b/mcon/U/sh.U index e66103a..f0b9965 100644 --- a/mcon/U/sh.U +++ b/mcon/U/sh.U @@ -1,13 +1,13 @@ -?RCS: $Id: sh.U,v 3.0.1.1 1997/02/28 16:20:13 ram Exp $ +?RCS: $Id$ ?RCS: ?RCS: Copyright (c) 1997, Chip Salzenberg -?RCS: Copyright (c) 1991-1993, Raphael Manfredi +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: ?RCS: You may redistribute only under the terms of the Artistic Licence, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of ?RCS: that same Artistic Licence; a copy of which may be found at the root -?RCS: of the source tree for dist 3.0. +?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: sh.U,v $ ?RCS: Revision 3.0.1.1 1997/02/28 16:20:13 ram @@ -63,10 +63,13 @@ case "$sh" in done for xxx in $try; do if test -f "$xxx"; then - sh="$xxx"; + sh="$xxx" + break + elif test -f "$xxx$_exe"; then + sh="$xxx" break elif test -f "$xxx.exe"; then - sh="$xxx"; + sh="$xxx" break fi done @@ -76,7 +79,7 @@ esac ?X: fd 4 isn't open yet... case "$sh" in -'') cat <<EOM >&2 +'') cat >&2 <<EOM $me: Fatal Error: I can't find a Bourne Shell anywhere. Usually it's in /bin/sh. How did you even get this far? |