d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MF22: fix to install script handling.

Browse Source
This commit is contained in:
Jordan K. Hubbard 1998-01-17 12:26:19 +00:00
parent 4722175765
commit 73dfa4e8d6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/pkg_install/add/perform.c
View File

@ -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;