timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-24 20:00:15 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix: correctly read user's product.json (#2057)

Browse Source
This commit is contained in:
Baptiste Augrain
2024-10-12 21:57:19 +02:00
committed by GitHub
parent d5c18fc231
commit 95fd5b764a
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
patches/merge-user-product.patch
View File

@@ -1,8 +1,15 @@
diff --git a/src/main.js b/src/main.js diff --git a/src/main.js b/src/main.js
index 10bd503..4048782 100644 index 10bd503..4d55178 100644
--- a/src/main.js --- a/src/main.js
+++ b/src/main.js +++ b/src/main.js
@@ -132,2 +132,14 @@ registerListeners(); @@ -42,2 +42,6 @@ import { resolveNLSConfiguration } from './vs/base/node/nls.js';
import { getUNCHost, addUNCHostToAllowlist } from './vs/base/node/unc.js';
+import { createRequire } from 'node:module'
+
+/** @ts-ignore */
+const require = createRequire(import.meta.url)
@@ -132,2 +136,14 @@ registerListeners();
+function resolveUserProduct() { +function resolveUserProduct() {
+ const userDataPath = getUserDataPath({}, product.nameShort ?? 'code-oss-dev'); + const userDataPath = getUserDataPath({}, product.nameShort ?? 'code-oss-dev');
@@ -17,7 +24,7 @@ index 10bd503..4048782 100644
+} +}
+ +
/** /**
@@ -208,2 +220,3 @@ function startup(codeCachePath, nlsConfig) { @@ -208,2 +224,3 @@ function startup(codeCachePath, nlsConfig) {
process.env['VSCODE_CODE_CACHE_PATH'] = codeCachePath || ''; process.env['VSCODE_CODE_CACHE_PATH'] = codeCachePath || '';
+ resolveUserProduct(); + resolveUserProduct();