diff options
author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1998-01-08 11:27:06 +0000 |
---|---|---|
committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1998-01-08 11:27:06 +0000 |
commit | 07eb524cb02e760c79c15830340e2000205f675d (patch) | |
tree | 921077b62880f38258e02fe9f6e3f2133a0e77fa /usr.sbin/pkg_install/add/perform.c | |
parent | e40dd207005efe7bc4a9c4d680dbce13450106a2 (diff) |
Don't assume install script is directly runnable - use sh -c.
Notes
Notes:
svn path=/head/; revision=32334
Diffstat (limited to 'usr.sbin/pkg_install/add/perform.c')
-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 28cd30f45aec..c3de367afa9e 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; |