Skip empty XDG values in shellexec (#2006)

esimkowitz · web-flow · commit 7d1c80568d29 · 2025-02-20T16:54:03.000-08:00
diff --git a/pkg/shellexec/shellexec.go b/pkg/shellexec/shellexec.go
@@ -534,7 +534,7 @@ func StartLocalShellProc(logCtx context.Context, termSize waveobj.TermSize, cmdS
 		if len(pamEnvs) > 0 {
 			// We only want to set the XDG variables from the PAM environment, all others should already be correct or may have been overridden by something else out of our control
 			for k := range pamEnvs {
-				if _, ok := varsToReplace[k]; ok {
+				if _, ok := varsToReplace[k]; ok && len(pamEnvs[k]) > 0 {
 					varsToReplace[k] = pamEnvs[k]
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -534,7 +534,7 @@ func StartLocalShellProc(logCtx context.Context, termSize waveobj.TermSize, cmdS`
`534`	`534`	`if len(pamEnvs) > 0 {`
`535`	`535`	`// We only want to set the XDG variables from the PAM environment, all others should already be correct or may have been overridden by something else out of our control`
`536`	`536`	`for k := range pamEnvs {`
`537`		`- if _, ok := varsToReplace[k]; ok {`
	`537`	`+ if _, ok := varsToReplace[k]; ok && len(pamEnvs[k]) > 0 {`
`538`	`538`	`varsToReplace[k] = pamEnvs[k]`
`539`	`539`	`}`
`540`	`540`	`}`