[src/pkgviews]: src/usr.sbin/pkg_install/view Specify a full path to linkfarm...

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

details:   https://anonhg.NetBSD.org/src/rev/9cf9ee5b553e
branches:  pkgviews
changeset: 534218:9cf9ee5b553e
user:      jlam <jlam%NetBSD.org@localhost>
date:      Mon Jul 14 12:08:02 2003 +0000

description:
Specify a full path to linkfarm so we always use the correct linkfarm
script.

diffstat:

 usr.sbin/pkg_install/view/pkg_view.sh |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r c25f813972f7 -r 9cf9ee5b553e usr.sbin/pkg_install/view/pkg_view.sh
--- a/usr.sbin/pkg_install/view/pkg_view.sh     Mon Jul 14 11:58:13 2003 +0000
+++ b/usr.sbin/pkg_install/view/pkg_view.sh     Mon Jul 14 12:08:02 2003 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: pkg_view.sh,v 1.1.2.4 2003/07/14 11:58:13 jlam Exp $
+# $NetBSD: pkg_view.sh,v 1.1.2.5 2003/07/14 12:08:02 jlam Exp $
 
 #
 # Copyright (c) 2001 Alistair G. Crooks.  All rights reserved.
@@ -38,6 +38,7 @@
 cpprog=/bin/cp
 findprog=/usr/bin/find
 grepprog=/usr/bin/grep
+linkfarmprog=/usr/sbin/linkfarm
 lnprog=/bin/ln
 mkdirprog=/bin/mkdir
 paxprog=/bin/pax
@@ -102,7 +103,7 @@
                        echo "Package $1 already exists in view \"${view}\""
                else
                        dbs=`(cd ${depot_pkg_dbdir}/$1; echo +*)`
-                       env PLIST_IGNORE_FILES="${PLIST_IGNORE_FILES} $dbs" linkfarm --target=${prefix}/${view} --dir=${depot_pkg_dbdir} $1
+                       env PLIST_IGNORE_FILES="${PLIST_IGNORE_FILES} $dbs" $linkfarmprog --target=${prefix}/${view} --dir=${depot_pkg_dbdir} $1
                        $mkdirprog -p ${depot_pkg_dbdir}/$1
                        temp=${depot_pkg_dbdir}/$1/+VIEWS.$$
                        $touchprog ${depot_pkg_dbdir}/$1/+VIEWS
@@ -115,14 +116,14 @@
                fi
                ;;
        check)
-               linkfarm -c --target=${prefix}/${view} --dir=${depot_pkg_dbdir} $1
+               $linkfarmprog -c --target=${prefix}/${view} --dir=${depot_pkg_dbdir} $1
                exit $?
                ;;
        delete)
                if [ ! -f ${pkg_dbdir}/$1/+CONTENTS ]; then
                        echo "Package $1 does not exist in view \"${view}\""
                else
-                       linkfarm -D --target=${prefix}/${view} --dir=${depot_pkg_dbdir} $1
+                       $linkfarmprog -D --target=${prefix}/${view} --dir=${depot_pkg_dbdir} $1
                        temp=${depot_pkg_dbdir}/$1/+VIEWS.$$
                        $cpprog ${depot_pkg_dbdir}/$1/+VIEWS ${temp}
                        ($grepprog -v "'"'^'${pkg_dbdir}'$'"'" ${temp} || true) > ${depot_pkg_dbdir}/$1/+VIEWS