[src/pkgviews]: src/usr.sbin/pkg_install/view Allow PLIST_IGNORE_FILES to con...

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

details:   https://anonhg.NetBSD.org/src/rev/7de0b068ecf0
branches:  pkgviews
changeset: 534229:7de0b068ecf0
user:      jlam <jlam%NetBSD.org@localhost>
date:      Mon Jul 14 22:54:51 2003 +0000

description:
Allow PLIST_IGNORE_FILES to contain shell glob patterns instead of just
relative paths to files.

diffstat:

 usr.sbin/pkg_install/view/linkfarm.1  |   7 ++++---
 usr.sbin/pkg_install/view/linkfarm.sh |  23 ++++++++++-------------
 usr.sbin/pkg_install/view/pkg_view.1  |   7 ++++---
 3 files changed, 18 insertions(+), 19 deletions(-)

diffs (103 lines):

diff -r 6a7e39a4f80e -r 7de0b068ecf0 usr.sbin/pkg_install/view/linkfarm.1
--- a/usr.sbin/pkg_install/view/linkfarm.1      Mon Jul 14 22:53:13 2003 +0000
+++ b/usr.sbin/pkg_install/view/linkfarm.1      Mon Jul 14 22:54:51 2003 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: linkfarm.1,v 1.1.2.1 2003/07/13 12:48:08 jlam Exp $
+.\"    $NetBSD: linkfarm.1,v 1.1.2.2 2003/07/14 22:54:51 jlam Exp $
 .\"
 .\" Copyright (c) 2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -117,12 +117,13 @@
 .Ar stowdir
 directories.
 .It Ev PLIST_IGNORE_FILES
-This can be used to specify the files in
+This can be used to specify shell glob patterns to match the files in
 .Ar package
 that should ignored when creating and deleting symbolic links in
 .Ar target .
 .Ev PLIST_IGNORE_FILES
-is a space-separated list of pathnames relative to the
+is a space-separated list of shell glob patterns that match files relative
+to the
 .Ar package
 directory.
 .El
diff -r 6a7e39a4f80e -r 7de0b068ecf0 usr.sbin/pkg_install/view/linkfarm.sh
--- a/usr.sbin/pkg_install/view/linkfarm.sh     Mon Jul 14 22:53:13 2003 +0000
+++ b/usr.sbin/pkg_install/view/linkfarm.sh     Mon Jul 14 22:54:51 2003 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: linkfarm.sh,v 1.1.2.5 2003/07/14 13:49:58 jlam Exp $
+# $NetBSD: linkfarm.sh,v 1.1.2.6 2003/07/14 22:54:51 jlam Exp $
 
 #
 # Copyright (c) 2002 Alistair G. Crooks.  All rights reserved.
@@ -120,10 +120,9 @@
                if [ -e $target/$newf ]; then
                        ignore=no
                        for i in $ignorefiles; do
-                               if [ $i = $newf ]; then
-                                       ignore=yes
-                                       break
-                               fi
+                               case $newf in
+                               $i)     ignore=yes; break ;;
+                               esac
                        done
                        case $ignore in
                        no)     
@@ -143,10 +142,9 @@
                newf=`echo $f | $sedprog -e 's|^\./||'`
                ignore=no
                for i in $ignorefiles; do
-                       if [ $i = $newf ]; then
-                               ignore=yes
-                               break
-                       fi
+                       case $newf in
+                       $i)     ignore=yes; break ;;
+                       esac
                done
                case $ignore in
                no)     
@@ -183,10 +181,9 @@
                newf=`echo $f | $sedprog -e 's|^\./||'`
                ignore=no
                for i in $ignorefiles; do
-                       if [ $i = $newf ]; then
-                               ignore=yes
-                               break
-                       fi
+                       case $newf in
+                       $i)     ignore=yes; break ;;
+                       esac
                done
                case $ignore in
                no)
diff -r 6a7e39a4f80e -r 7de0b068ecf0 usr.sbin/pkg_install/view/pkg_view.1
--- a/usr.sbin/pkg_install/view/pkg_view.1      Mon Jul 14 22:53:13 2003 +0000
+++ b/usr.sbin/pkg_install/view/pkg_view.1      Mon Jul 14 22:54:51 2003 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: pkg_view.1,v 1.1.2.3 2003/07/14 22:53:13 jlam Exp $
+.\"    $NetBSD: pkg_view.1,v 1.1.2.4 2003/07/14 22:54:51 jlam Exp $
 .\"
 .\" Copyright (c) 2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -120,12 +120,13 @@
 .Ev PKG_DBDIR
 environment variable.
 .It Ev PLIST_IGNORE_FILES
-This can be used to specify the files in
+This can be used to specify shell glob patterns to match files in
 .Ar package
 that should ignored when adding or removing the package from
 .Ar view .
 .Ev PLIST_IGNORE_FILES
-is a space-separated list of pathnames relative to the
+is a space-separated list of shell glob patterns that match files relative
+to the
 .Ar package
 directory.
 .It Ev PKG_VIEW