Repository navigation
Commit 23781bb
fix(server): scrub AppImage XDG_DATA_DIRS and GSETTINGS_SCHEMA_DIR from terminals
The integrated terminal inherits the server process environment. On Linux
AppImage builds the runtime's `AppRun` points `XDG_DATA_DIRS` at an
`$APPDIR/usr/share` entry and `GSETTINGS_SCHEMA_DIR` at the bundled
`$APPDIR/usr/share/glib-2.0/schemas`. The existing scrub (added for #1699) only
cleaned `PATH`/`LD_LIBRARY_PATH`, so those two leaked into the PTY and
`gsettings` inside the terminal reported "No schemas installed" (and tools saw
the AppImage's data dir instead of the host's).
Both are colon-separated search paths, so add them to the same
`APPIMAGE_PATH_LIKE_ENV_KEYS` scrub: the AppImage mount segments are dropped and
the user's real entries preserved, and when only mount segments remain the
variable is removed so the shell falls back to the platform default. Extended
the existing AppImage terminal test to assert both.
Closes #5059
Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>1 parent e259dd2 commit 23781bb
2 files changed
Lines changed: 20 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1345 | 1345 | | |
1346 | 1346 | | |
1347 | 1347 | | |
| 1348 | + | |
| 1349 | + | |
1348 | 1350 | | |
1349 | 1351 | | |
1350 | 1352 | | |
| |||
1364 | 1366 | | |
1365 | 1367 | | |
1366 | 1368 | | |
| 1369 | + | |
| 1370 | + | |
| 1371 | + | |
| 1372 | + | |
| 1373 | + | |
1367 | 1374 | | |
1368 | 1375 | | |
1369 | 1376 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1069 | 1069 | | |
1070 | 1070 | | |
1071 | 1071 | | |
1072 | | - | |
1073 | | - | |
1074 | | - | |
1075 | | - | |
| 1072 | + | |
| 1073 | + | |
| 1074 | + | |
| 1075 | + | |
| 1076 | + | |
| 1077 | + | |
| 1078 | + | |
| 1079 | + | |
| 1080 | + | |
| 1081 | + | |
| 1082 | + | |
| 1083 | + | |
| 1084 | + | |
1076 | 1085 | | |
1077 | 1086 | | |
1078 | 1087 | | |
| |||
0 commit comments