When saving a command, only include a few selected environment variables

Author: xyproto

Diff for: v2/lastcmd.go

@@ -57,9 +57,12 @@ func saveCommand(cmd *exec.Cmd) error {
 	// Strip the leading /usr/bin/sh -c command, if present
 	commandString := getCommand(cmd)
 
-	// Add environment variables
+	// Add environment variables, but only some
+	selectedEnvVars := []string{"NO_COLOR", "PYTHON"}
 	for _, assignment := range cmd.Env {
-		commandString = assignment + " " + commandString
+		if strings.Contains(assignment, "=") && containsSubstring(assignment, selectedEnvVars) {
+			commandString = strings.Replace(assignment, "=", "=\"", 1) + "\" \\\n" + commandString
+		}
 	}
 
 	// Write the contents, ignore the number of written bytes

Diff for: v2/strings.go

@@ -29,6 +29,16 @@ func hasWords(s string) bool {
 	return false
 }
 
+// containsSubstring checks if the given string contains one of the given substrings
+func containsSubstring(haystack string, substrings []string) bool {
+	for _, ss := range substrings {
+		if strings.Contains(haystack, ss) {
+			return true
+		}
+	}
+	return false
+}
+
 // allUpper checks if all letters in a string are uppercase
 func allUpper(s string) bool {
 	for _, r := range s {