X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-script.c;h=b8c94589f5d623d4463bc0a5a91b941e20eb5527;hb=5cc943f078123837c33a4eeebf6eb96a581ddb47;hp=fac3612b8f9f2bcdd1ca6cecaa676dd0fe4552c6;hpb=ce85b9dd19d55851cd831da8c2dfe4044fd946b1;p=zpackage

diff --git a/zpm-script.c b/zpm-script.c
index fac3612..b8c9458 100644
--- a/zpm-script.c
+++ b/zpm-script.c
@@ -26,7 +26,7 @@
  */
 
 void usage(void) {
-	fprintf(stderr, "usage: db hash file\n");
+	fprintf(stderr, "usage: zpm script ...\n");
 }
 
 int setdir(char *rootdir) {
@@ -143,10 +143,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 +155,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 +188,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();