update-xdg-path.patch 1.3 KB

12345678910111213141516171819202122
  1. diff --git a/extensions/git/src/ipc/ipcServer.ts b/extensions/git/src/ipc/ipcServer.ts
  2. index a7142fe..526ca17 100644
  3. --- a/extensions/git/src/ipc/ipcServer.ts
  4. +++ b/extensions/git/src/ipc/ipcServer.ts
  5. @@ -20,3 +20,7 @@ function getIPCHandlePath(id: string): string {
  6. if (process.platform !== 'darwin' && process.env['XDG_RUNTIME_DIR']) {
  7. - return path.join(process.env['XDG_RUNTIME_DIR'] as string, `vscode-git-${id}.sock`);
  8. + if (!!process.env.FLATPAK_ID) {
  9. + return path.join(process.env['XDG_RUNTIME_DIR'] as string, 'app', process.env.FLATPAK_ID, `vscode-git-${id}.sock`);
  10. + } else {
  11. + return path.join(process.env['XDG_RUNTIME_DIR'] as string, `vscode-git-${id}.sock`);
  12. + }
  13. }
  14. diff --git a/src/vs/base/parts/ipc/node/ipc.net.ts b/src/vs/base/parts/ipc/node/ipc.net.ts
  15. index 629f2c4..ec1acba 100644
  16. --- a/src/vs/base/parts/ipc/node/ipc.net.ts
  17. +++ b/src/vs/base/parts/ipc/node/ipc.net.ts
  18. @@ -774,3 +774,3 @@ function unmask(buffer: VSBuffer, mask: number): void {
  19. // Related to https://github.com/microsoft/vscode/issues/30624
  20. -export const XDG_RUNTIME_DIR = <string | undefined>process.env['XDG_RUNTIME_DIR'];
  21. +export const XDG_RUNTIME_DIR = <string | undefined>(!!process.env.FLATPAK_ID ? join(process.env['XDG_RUNTIME_DIR'] as string, 'app', process.env.FLATPAK_ID) : process.env['XDG_RUNTIME_DIR']);