diff options
| author | christos <christos@NetBSD.org> | 2002-10-17 03:31:33 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2002-10-17 03:31:33 +0000 |
| commit | 590fa669c8d8dee326e9540fdae461ef4c9d6f59 (patch) | |
| tree | fc5354671378d5829a709c25be360e28577e936a /usr.sbin/pkg_install/delete | |
| parent | fe9dc5bbfc2256202a8a237372215c5b9008bebe (diff) | |
- 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 (limited to 'usr.sbin/pkg_install/delete')
| -rw-r--r-- | usr.sbin/pkg_install/delete/perform.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/pkg_install/delete/perform.c b/usr.sbin/pkg_install/delete/perform.c index 09aaedbe1df..af240e0ab48 100644 --- a/usr.sbin/pkg_install/delete/perform.c +++ b/usr.sbin/pkg_install/delete/perform.c @@ -1,11 +1,11 @@ -/* $NetBSD: perform.c,v 1.36 2002/06/10 09:14:27 yamt Exp $ */ +/* $NetBSD: perform.c,v 1.37 2002/10/17 03:31:34 christos Exp $ */ #include <sys/cdefs.h> #ifndef lint #if 0 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.15 1997/10/13 15:03:52 jkh Exp"; #else -__RCSID("$NetBSD: perform.c,v 1.36 2002/06/10 09:14:27 yamt Exp $"); +__RCSID("$NetBSD: perform.c,v 1.37 2002/10/17 03:31:34 christos Exp $"); #endif #endif @@ -588,7 +588,7 @@ pkg_do(char *pkg) if (fexists(REQUIRE_FNAME)) { if (Verbose) printf("Executing 'require' script.\n"); - vsystem("%s +x %s", CHMOD, REQUIRE_FNAME); /* be sure */ + vsystem("%s +x %s", CHMOD_CMD, REQUIRE_FNAME); /* be sure */ if (vsystem("./%s %s DEINSTALL", REQUIRE_FNAME, pkg)) { warnx("package %s fails requirements %s", pkg, Force ? "" : "- not deleted"); @@ -600,7 +600,7 @@ pkg_do(char *pkg) if (Fake) printf("Would execute de-install script at this point (arg: DEINSTALL).\n"); else { - vsystem("%s +x %s", CHMOD, DEINSTALL_FNAME); /* make sure */ + vsystem("%s +x %s", CHMOD_CMD, DEINSTALL_FNAME); /* make sure */ if (vsystem("./%s %s DEINSTALL", DEINSTALL_FNAME, pkg)) { warnx("deinstall script returned error status"); if (!Force) |
