diff options
| author | jkh <jkh@FreeBSD.org> | 1998-01-17 12:26:19 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1998-01-17 12:26:19 +0000 |
| commit | 3313481cd8f9d04be880c474b5cc1de29063bb1a (patch) | |
| tree | 34425b51ece876d15b056258672a8d631bb02839 | |
| parent | b130b30c96fd365316e5a4f21ec0965be052e78b (diff) | |
| download | FreeBSD-src-3313481cd8f9d04be880c474b5cc1de29063bb1a.zip FreeBSD-src-3313481cd8f9d04be880c474b5cc1de29063bb1a.tar.gz | |
MF22: fix to install script handling.
| -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 c3de367..b28e3ff 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.45 1997/10/18 05:54:14 jkh Exp $"; + "$Id: perform.c,v 1.46 1998/01/08 11:27:06 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("sh -c %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("sh -c %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("sh -c %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; |
