aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1993-10-08 01:19:35 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1993-10-08 01:19:35 +0000
commit6e27d757771b0ed15431f750073b76b3675e3ea1 (patch)
tree904c8572a82dedadd2f94d82491509908df87f76 /usr.sbin
parentdd06619c32c547d4ee83e4f96ab0a48230d4571c (diff)
downloadsrc-6e27d757771b0ed15431f750073b76b3675e3ea1.tar.gz
src-6e27d757771b0ed15431f750073b76b3675e3ea1.zip
Fix problems with executing from current directory
Notes
Notes: svn path=/head/; revision=545
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/pkg_install/add/perform.c8
-rw-r--r--usr.sbin/pkg_install/delete/perform.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c
index be7b5078eeae..7c6a28324a71 100644
--- a/usr.sbin/pkg_install/add/perform.c
+++ b/usr.sbin/pkg_install/add/perform.c
@@ -1,5 +1,5 @@
#ifndef lint
-static const char *rcsid = "$Id: perform.c,v 1.3 1993/09/05 04:53:50 jkh Exp $";
+static const char *rcsid = "$Id: perform.c,v 1.4 1993/09/18 03:38:48 jkh Exp $";
#endif
/*
@@ -123,7 +123,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("./%s %s INSTALL", REQUIRE_FNAME, PkgName)) {
whinge("Package %s fails requirements - not installed.",
pkg_fullname);
goto fail;
@@ -133,7 +133,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("./%s %s PRE-INSTALL", INSTALL_FNAME, PkgName)) {
whinge("Install script returned error status.");
goto fail;
}
@@ -142,7 +142,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("./%s %s POST-INSTALL", INSTALL_FNAME, PkgName)) {
whinge("Install script returned error status.");
goto fail;
}
diff --git a/usr.sbin/pkg_install/delete/perform.c b/usr.sbin/pkg_install/delete/perform.c
index b806e479e4ad..76e92eeed44f 100644
--- a/usr.sbin/pkg_install/delete/perform.c
+++ b/usr.sbin/pkg_install/delete/perform.c
@@ -1,5 +1,5 @@
#ifndef lint
-static const char *rcsid = "$Id: perform.c,v 1.2 1993/09/04 05:06:39 jkh Exp $";
+static const char *rcsid = "$Id: perform.c,v 1.2 1993/09/03 23:01:02 jkh Exp $";
#endif
/*
@@ -69,7 +69,7 @@ pkg_do(char *pkg)
if (Verbose)
printf("Executing 'require' script.\n");
vsystem("chmod +x %s", REQUIRE_FNAME); /* be sure */
- if (vsystem("%s %s DEINSTALL", REQUIRE_FNAME, pkg)) {
+ if (vsystem("./%s %s DEINSTALL", REQUIRE_FNAME, pkg)) {
whinge("Package %s fails requirements - not deleted.", pkg);
return 1;
}
@@ -89,7 +89,7 @@ pkg_do(char *pkg)
printf("Would execute de-install script at this point.\n");
else {
vsystem("chmod +x %s", DEINSTALL_FNAME); /* make sure */
- if (vsystem("%s %s DEINSTALL", DEINSTALL_FNAME, pkg)) {
+ if (vsystem("./%s %s DEINSTALL", DEINSTALL_FNAME, pkg)) {
whinge("De-Install script returned error status.");
return 1;
}