Skip exec.LookPath if a specific gzip implementation is disabled

kzys · kzys · commit 7f399ce2779a · 2023-10-06T09:20:08.000-07:00
Both pigz and igzip can be disabled via the environment variables.
If disabled, calling exec.LookPath and logging "not found" message is,
even in the debug level, doesn't make much sense.
diff --git a/archive/compression/compression.go b/archive/compression/compression.go
@@ -303,25 +303,22 @@ func cmdStream(cmd *exec.Cmd, in io.Reader) (io.ReadCloser, error) {
 }
 
 func detectCommand(path, disableEnvName string) string {
-	path, err := exec.LookPath(path)
-	if err != nil {
-		log.L.WithError(err).Debugf("%s not found", path)
-		return ""
-	}
-
 	// Check if this command is disabled via the env variable
 	value := os.Getenv(disableEnvName)
-	if value == "" {
-		return path
-	}
+	if value != "" {
+		disable, err := strconv.ParseBool(value)
+		if err != nil {
+			log.L.WithError(err).Warnf("could not parse %s: %s", disableEnvName, value)
+		}
 
-	disable, err := strconv.ParseBool(value)
-	if err != nil {
-		log.L.WithError(err).Warnf("could not parse %s: %s", disableEnvName, value)
-		return path
+		if disable {
+			return ""
+		}
 	}
 
-	if disable {
+	path, err := exec.LookPath(path)
+	if err != nil {
+		log.L.WithError(err).Debugf("%s not found", path)
 		return ""
 	}
 
