[src/netbsd-1-6]: src/usr.sbin/pkg_install/add Pull up revision 1.74 (request...

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

details:   https://anonhg.NetBSD.org/src/rev/b932c097917b
branches:  netbsd-1-6
changeset: 529527:b932c097917b
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Nov 24 22:34:38 2002 +0000

description:
Pull up revision 1.74 (requested by jschauma in ticket #1011):
- eliminate the hard-coding of pathnames in the default install.
- all command executions now use the path [execvp/execlp/system].
- normalize the macro names as <COMMAND>_CMD.
- in some OS's full pathnames for commands can still be provided, but this
  is not the default.
This was needed to fix -DTAR_FULLPATHNAME="/usr/bin/tar"

diffstat:

 usr.sbin/pkg_install/add/perform.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r 87211ba6db1c -r b932c097917b usr.sbin/pkg_install/add/perform.c
--- a/usr.sbin/pkg_install/add/perform.c        Sun Nov 24 22:34:29 2002 +0000
+++ b/usr.sbin/pkg_install/add/perform.c        Sun Nov 24 22:34:38 2002 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: perform.c,v 1.63.2.8 2002/11/24 22:23:34 tron Exp $    */
+/*     $NetBSD: perform.c,v 1.63.2.9 2002/11/24 22:34:38 tron Exp $    */
 
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.63.2.8 2002/11/24 22:23:34 tron Exp $");
+__RCSID("$NetBSD: perform.c,v 1.63.2.9 2002/11/24 22:34:38 tron Exp $");
 #endif
 #endif
 
@@ -482,7 +482,7 @@
 
        /* Look for the requirements file */
        if (fexists(REQUIRE_FNAME)) {
-               vsystem("%s +x %s", CHMOD, REQUIRE_FNAME);      /* be sure */
+               vsystem("%s +x %s", CHMOD_CMD, REQUIRE_FNAME);  /* be sure */
                if (Verbose)
                        printf("Running requirements file first for %s.\n", PkgName);
                if (!Fake && vsystem("./%s %s INSTALL", REQUIRE_FNAME, PkgName)) {
@@ -497,7 +497,7 @@
        
        /* If we're really installing, and have an installation file, run it */
        if (!NoInstall && fexists(INSTALL_FNAME)) {
-               vsystem("%s +x %s", CHMOD, INSTALL_FNAME);      /* make sure */
+               vsystem("%s +x %s", CHMOD_CMD, INSTALL_FNAME);  /* make sure */
                if (Verbose)
                        printf("Running install with PRE-INSTALL for %s.\n", PkgName);
                if (!Fake && vsystem("./%s %s PRE-INSTALL", INSTALL_FNAME, PkgName)) {
@@ -562,7 +562,7 @@
                        goto success;   /* close enough for government work */
                }
                /* Make sure pkg_info can read the entry */
-               vsystem("%s a+rx %s", CHMOD, LogDir);
+               vsystem("%s a+rx %s", CHMOD_CMD, LogDir);
                if (fexists(DEINSTALL_FNAME))
                        move_file(".", DEINSTALL_FNAME, LogDir);
                if (fexists(REQUIRE_FNAME))