diff options
| author | jkh <jkh@FreeBSD.org> | 1998-01-21 06:08:35 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1998-01-21 06:08:35 +0000 |
| commit | e21210fa7141c03187a279133478762305f100b7 (patch) | |
| tree | 248b9db00523a02ca12aa98047c7f32d4cea37bf /usr.sbin/pkg_install | |
| parent | 8a229af5668a46fda9ae9c7a0fc18cf5d0f2e337 (diff) | |
| download | FreeBSD-src-e21210fa7141c03187a279133478762305f100b7.zip FreeBSD-src-e21210fa7141c03187a279133478762305f100b7.tar.gz | |
I must have been smoking crack when I made this change. Using sh -c
in a vsystem() call is just a ludicrous way of calling sh -c "sh -c ..."
Whoops! I don't know my own bloody code here!
Diffstat (limited to 'usr.sbin/pkg_install')
| -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 b28e3ff..10b2628 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.46 1998/01/08 11:27:06 jkh Exp $"; + "$Id: perform.c,v 1.47 1998/01/17 12:26:19 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("./%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("./%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("./%s %s POST-INSTALL", INSTALL_FNAME, PkgName)) { warnx("install script returned error status"); unlink(INSTALL_FNAME); code = 1; |
