Skip to content

fix(shellexec): avoid false Snap detection and empty XDG_* vars #3402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jason-Shen2 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(shellexec): avoid false Snap detection and empty XDG_* vars #3402

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion pkg/shellexec/shellexec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,8 +648,12 @@ func StartLocalShellProc(logCtx context.Context, termSize waveobj.TermSize, cmdS
overrides them to point to snap directories. We will get the correct values, if
set, from the PAM environment. If the XDG variables are set in profile or in an
RC file, it will be overridden when the shell initializes.

Only apply this correction when Wave itself is running as a Snap (SNAP_NAME == "waveterm"),
not when $SNAP is merely inherited from a parent Snap process (e.g. a CLI tool
installed via Snap).
*/
if os.Getenv("SNAP") != "" {
if os.Getenv("SNAP_NAME") == "waveterm" {
log.Printf("Detected Snap installation, correcting XDG environment variables")
varsToReplace := map[string]string{"XDG_CONFIG_HOME": "", "XDG_DATA_HOME": "", "XDG_CACHE_HOME": "", "XDG_RUNTIME_DIR": "", "XDG_CONFIG_DIRS": "", "XDG_DATA_DIRS": ""}
pamEnvs := tryGetPamEnvVars()
Expand All @@ -661,6 +665,15 @@ func StartLocalShellProc(logCtx context.Context, termSize waveobj.TermSize, cmdS
}
}
}
// Remove keys that still have empty values so they are not explicitly set to
// empty strings in the child environment (which breaks tools that fall back to
// XDG spec defaults). When a key is absent from varsToReplace the child will
// either inherit the parent value or rely on shell rc files / spec defaults.
for k, v := range varsToReplace {
if v == "" {
delete(varsToReplace, k)
}
}
log.Printf("Setting XDG environment variables to: %v", varsToReplace)
shellutil.UpdateCmdEnv(ecmd, varsToReplace)
}
Expand Down