diff options
| author | jkh <jkh@FreeBSD.org> | 1998-01-08 11:27:06 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1998-01-08 11:27:06 +0000 |
| commit | b538b7d179f3022aa7a902844acea6041713c16c (patch) | |
| tree | 0aef26be7f2d5d6cc3328922bdf8ef871e138847 /usr.sbin/pkg_install/add | |
| parent | 6e97628d820ebf233e6e6424b1bf849d2dfb5d6c (diff) | |
| download | FreeBSD-src-b538b7d179f3022aa7a902844acea6041713c16c.zip FreeBSD-src-b538b7d179f3022aa7a902844acea6041713c16c.tar.gz | |
Don't assume install script is directly runnable - use sh -c.
Diffstat (limited to 'usr.sbin/pkg_install/add')
| -rw-r--r-- | usr.sbin/pkg_install/add/perform.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c index 28cd30f..c3de367 100644 --- a/usr.sbin/pkg_install/add/perform.c +++ b/usr.sbin/pkg_install/add/perform.c @@ -1,6 +1,6 @@ #ifndef lint static const char rcsid[] = - "$Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp $"; + "$Id: perform.c,v 1.45 1997/10/18 05:54:14 jkh Exp $"; #endif /* @@ -297,7 +297,7 @@ pkg_do(char *pkg) vsystem("chmod +x %s", REQUIRE_FNAME); /* be sure */ if (Verbose) printf("Running requirements file first for %s..\n", PkgName); - if (!Fake && vsystem("./%s %s INSTALL", REQUIRE_FNAME, PkgName)) { + if (!Fake && vsystem("sh -c %s %s INSTALL", REQUIRE_FNAME, PkgName)) { warnx("package %s fails requirements %s", pkg_fullname, Force ? "installing anyway" : "- not installed"); if (!Force) { @@ -312,7 +312,7 @@ pkg_do(char *pkg) vsystem("chmod +x %s", 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)) { + if (!Fake && vsystem("sh -c %s %s PRE-INSTALL", INSTALL_FNAME, PkgName)) { warnx("install script returned error status"); unlink(INSTALL_FNAME); code = 1; @@ -341,7 +341,7 @@ pkg_do(char *pkg) if (!NoInstall && fexists(INSTALL_FNAME)) { if (Verbose) printf("Running install with POST-INSTALL for %s..\n", PkgName); - if (!Fake && vsystem("./%s %s POST-INSTALL", INSTALL_FNAME, PkgName)) { + if (!Fake && vsystem("sh -c %s %s POST-INSTALL", INSTALL_FNAME, PkgName)) { warnx("install script returned error status"); unlink(INSTALL_FNAME); code = 1; |
