mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-21 01:03:42 +00:00
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!
This commit is contained in:
parent
aa8e05197c
commit
8b1643d2c6
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=32665
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue