X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-script.c;h=7c03b241792ae1f91ea504215b1400526580c71b;hb=62f6ff407bc4f2cf03d1fa7cf3dc9a3f4026624a;hp=a91f2ac3195974c030a0fc5b28c9645e319feaf6;hpb=c02e8d831122a804f675a2f106b2e23af235be58;p=zpackage

diff --git a/zpm-script.c b/zpm-script.c
index a91f2ac..7c03b24 100644
--- a/zpm-script.c
+++ b/zpm-script.c
@@ -26,15 +26,16 @@
  */
 
 void usage(void) {
-	fprintf(stderr, "usage: db hash file\n");
+	fprintf(stderr, "usage: zpm script ...\n");
 }
 
 int setdir(char *rootdir) {
+	if (chdir(rootdir ? rootdir : "/") == -1) {
+		perror("can not chdir to rootdir");
+		return 0;
+	}
+#if 0
 	if (rootdir && strcmp(rootdir, "/")) {
-		if (chdir(rootdir) == -1) {
-			perror("can not chdir to rootdir");
-			return 0;
-		}
 		if (geteuid() == 0) {
 			/* chroot is deprecated, and not in posix.  need to use
 			 * OS/kernel specific code.
@@ -43,12 +44,8 @@ int setdir(char *rootdir) {
 		} else {
 			fprintf(stderr, "unable to chroot as non root user\n");
 		}
-	} else {
-		if (chdir("/") == -1) {
-			perror("can not chdir to /");
-			return 0;
-		}
 	}
+#endif
 	return 1;
 }
 
@@ -143,10 +140,10 @@ int main(int ac, char **av){
 	char *script = "/var/tmp/zpm-script";
 	char *output = "/var/tmp/zpm-script.out";
 	char *phase = 0;
+	char *envvar = 0;
 	int quiet = 0;
 	int scriptishash = 0;
 	int mode = RUN;
-	int all = 0;
 
 	if (getenv("ZPMDB")) {
 		db = getenv("ZPMDB");
@@ -155,6 +152,16 @@ int main(int ac, char **av){
 
 	rootdir = getenv("ZPM_ROOT_DIR");
 
+	envvar = getenv("ZPM_SCRIPT_FILE");
+	if (envvar) {
+		script = envvar;
+	}
+
+	envvar = getenv("ZPM_SCRIPT_OUTPUT");
+	if (envvar) {
+		output = envvar;
+	}
+
 	/* run, set, show, hash */
 	/* set -S, if -H set the hash, output hash, unless quiet
 	 * show: -o, or stdout, 
@@ -178,12 +185,11 @@ int main(int ac, char **av){
 			case 'l': mode = LIST; break;
 			case 'R': rootdir = optarg; break;
 			case 'F': required = 1; break;
-			case 'a': all = 1; break;
 
 			case 'h': scriptishash = 1; break;
 			case 'o': output = optarg; break;
 			case 'S': script = optarg; break;
-			case 'q': quiet = 1;
+			case 'q': quiet = 1; break;
 
 			default:
 				  usage();
@@ -259,7 +265,9 @@ int main(int ac, char **av){
 		} else if (!zpm_script_hash(&zpm, pkgid, phase, hash)) {
 			fail = SOFT;
 		} else if (scriptishash) {
-			printf("%s\n", hash);
+			if (!quiet) {
+				printf("%s\n", hash);
+			}
 		} else {
 			if (!output) {
 				output = "-";
@@ -308,6 +316,7 @@ int main(int ac, char **av){
 		if (!zpm_extract(&zpm, hash, script, 0700)) {
 			fprintf(stderr, "unable to extract script");
 			fail = HARD;
+			zpm_note_add(&zpm, pkgid, NULL, hash, "unable to extract %s script", phase);
 			goto cleanup;
 		}
 
@@ -315,6 +324,10 @@ int main(int ac, char **av){
 		if (rv) {
 			fprintf(stderr, "package %s script failed with code %d\n",
 					pkgid, rv);
+			
+			zpm_import(&zpm, output, 0, hash);
+			zpm_note_add(&zpm, pkgid, NULL, hash, "package %s script failed with code %d", phase, rv);
+
 			fail = HARD;
 		}
 
@@ -332,5 +345,4 @@ cleanup:
 	zpm_close(&zpm);
 
 	return (fail == HARD || (required && fail)) ? EXIT_FAILURE : 0;
-
 }