From 7eba00581c3ce34f0944eb31e74cca6d4d5cda8f Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 10 Jan 2021 14:40:17 +0300
Subject: [PATCH 1/1] REDO_JOBS must not precede -j

---
 js.go     | 15 ++++++++-------
 news.texi |  6 ++++++
 usage.go  |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/js.go b/js.go
index 9f2adaa..a984669 100644
--- a/js.go
+++ b/js.go
@@ -42,7 +42,7 @@ var (
 	jsTokens  int
 	jsTokensM sync.Mutex
 
-	flagJobs = flag.Uint64("j", 1, fmt.Sprintf("number of parallel jobs (0=inf) (%s)", EnvJobs))
+	flagJobs = flag.Int("j", -1, fmt.Sprintf("number of parallel jobs (0=inf, <0=1) (%s)", EnvJobs))
 )
 
 func jsInit() {
@@ -73,22 +73,23 @@ func jsInit() {
 		return
 	}
 
-	var jobs uint64
-	if v := os.Getenv(EnvJobs); v != "" {
-		var err error
+	jobs := uint64(1)
+	var err error
+	if *flagJobs == 0 {
+		jobs = 0
+	} else if *flagJobs > 0 {
+		jobs = uint64(*flagJobs)
+	} else if v := os.Getenv(EnvJobs); v != "" {
 		jobs, err = strconv.ParseUint(v, 10, 64)
 		if err != nil {
 			log.Fatalln("can not parse", EnvJobs, err)
 		}
-	} else {
-		jobs = *flagJobs
 	}
 	if jobs == 0 {
 		// infinite jobs
 		return
 	}
 
-	var err error
 	JSR, JSW, err = os.Pipe()
 	if err != nil {
 		panic(err)
diff --git a/news.texi b/news.texi
index 5796ba6..de7f880 100644
--- a/news.texi
+++ b/news.texi
@@ -3,6 +3,12 @@
 
 @table @strong
 
+@anchor{Release 0.11.0}
+@item 0.11.0
+    Previously @env{REDO_JOBS} overrided even explicitly specified
+    @option{-j} option. Fix that behaviour -- command line options must
+    precede environment variables.
+
 @anchor{Release 0.10.0}
 @item 0.10.0
     Initial tarballed release.
diff --git a/usage.go b/usage.go
index 5779109..f7ca044 100644
--- a/usage.go
+++ b/usage.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	Version  = "0.10.0"
+	Version  = "0.11.0"
 	Warranty = `This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, version 3 of the License.
-- 
2.44.0