[src/trunk]: src/share/sushi/install/install Apply fix from PR's 14442 and 14...

[garbled <garbled%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1c8fcc5ae84d
branches:  trunk
changeset: 521876:1c8fcc5ae84d
user:      garbled <garbled%NetBSD.org@localhost>
date:      Thu Feb 07 16:12:31 2002 +0000

description:
Apply fix from PR's 14442 and 14441 from Robert Elz to make the install
from source work.  Thanks Robert.

diffstat:

 share/sushi/install/install/script1 |  6 +++---
 share/sushi/install/install/script2 |  9 +++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diffs (46 lines):

diff -r 455e6e4b1e5c -r 1c8fcc5ae84d share/sushi/install/install/script1
--- a/share/sushi/install/install/script1       Thu Feb 07 14:30:22 2002 +0000
+++ b/share/sushi/install/install/script1       Thu Feb 07 16:12:31 2002 +0000
@@ -1,5 +1,5 @@
 #!/bin/ksh
-# $NetBSD: script1,v 1.1 2001/01/05 02:06:57 garbled Exp $
+# $NetBSD: script1,v 1.2 2002/02/07 16:12:31 garbled Exp $
 if [ -z "$PKGSRCDIR" ]; then
        if [ -d "/usr/pkgsrc" ]; then
                PKGSRCDIR="/usr/pkgsrc"
@@ -8,7 +8,7 @@
                PKGSRCDIR="/usr/src/pkgsrc"
        fi
 fi
-cd $PKGSRCDIR/$1
+cd $PKGSRCDIR/$1 || exit 0
 #for i in */Makefile
 #do
 #      grep PKGNAME= $i >/dev/null
@@ -21,4 +21,4 @@
 #              fi
 #      fi
 #done
-ls -1d */ | grep -v pkg | sed -e 's@/@@'
+ls -1d */ | sed -e 's@/@@' | egrep -v '^(CVS|pkg)$'
diff -r 455e6e4b1e5c -r 1c8fcc5ae84d share/sushi/install/install/script2
--- a/share/sushi/install/install/script2       Thu Feb 07 14:30:22 2002 +0000
+++ b/share/sushi/install/install/script2       Thu Feb 07 16:12:31 2002 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: script2,v 1.1 2001/01/24 09:35:57 garbled Exp $
+# $NetBSD: script2,v 1.2 2002/02/07 16:12:31 garbled Exp $
 if [ -z "$PKGSRCDIR" ]; then
        if [ -d "/usr/pkgsrc" ]; then
                PKGSRCDIR="/usr/pkgsrc"
@@ -8,8 +8,5 @@
                PKGSRCDIR="/usr/src/pkgsrc"
        fi
 fi
-cd $PKGSRCDIR/$2/$1
-if [ "$?" != "1" ]; then
-       exit 0
-fi
-ls -1d */ | sed -e s'@/@@' | egrep -v '(mk|distfiles)'
+cd $PKGSRCDIR/$2/$1 || exit 0
+ls -1d */ | sed -e s'@/@@' | egrep -v '(mk|distfiles|CVS|packages)'