VSCodium/vscodium
1
1
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2024-12-23 08:52:43 +03:00
Code Issues Projects Releases Wiki Activity

feat(1.74): update custom gallery patch

Browse Source
This commit is contained in:
Baptiste Augrain 2022-11-12 10:09:54 +01:00
parent d0b246a9e1
commit de28e119be
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
insider.json
View File

@ -1,4 +1,4 @@
{ {
"tag": "1.74.0", "tag": "1.74.0",
"commit": "9d5741f01a67beea273121615b2d015fc298d9ea" "commit": "ef415578d1b1019db585718968a303eeca4b8979"
} }

10
patches/custom-gallery.patch
View File

@ -1,10 +1,12 @@
diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
index bceda01..174c766 100644 index 3f50bef..2b4e8c2 100644
--- a/src/vs/platform/product/common/product.ts --- a/src/vs/platform/product/common/product.ts
+++ b/src/vs/platform/product/common/product.ts +++ b/src/vs/platform/product/common/product.ts
@@ -6,3 +6,3 @@ @@ -5,4 +5,4 @@
import { FileAccess } from 'vs/base/common/network';
-import { FileAccess } from 'vs/base/common/network';
-import { globals } from 'vs/base/common/platform'; -import { globals } from 'vs/base/common/platform';
+import { AppResourcePath, FileAccess } from 'vs/base/common/network';
+import { globals, isWindows } from 'vs/base/common/platform'; +import { globals, isWindows } from 'vs/base/common/platform';
import { env } from 'vs/base/common/process'; import { env } from 'vs/base/common/process';
@@ -11,2 +11,3 @@ import { dirname, joinPath } from 'vs/base/common/resources'; @@ -11,2 +11,3 @@ import { dirname, joinPath } from 'vs/base/common/resources';
@ -46,7 +48,7 @@ index bceda01..174c766 100644
+ const userDataPath = getUserDataPath({} as any, product.nameShort); + const userDataPath = getUserDataPath({} as any, product.nameShort);
+ const userProductPath = isWindows ? `file:///${userDataPath}/product.json` : `file://${userDataPath}/product.json`; + const userProductPath = isWindows ? `file:///${userDataPath}/product.json` : `file://${userDataPath}/product.json`;
+ +
+ const userProduct = require.__$__nodeRequire(FileAccess.asFileUri(userProductPath, require).fsPath); + const userProduct = require.__$__nodeRequire(FileAccess.asFileUri(userProductPath as AppResourcePath).fsPath);
+ +
+ product = merge(product, userProduct); + product = merge(product, userProduct);
+ } catch (ex) { + } catch (ex) {

4
undo_telemetry.sh
View File

@ -14,12 +14,12 @@ REPLACEMENT="s|//[^/]+\.data\.microsoft\.com|//0\.0\.0\.0|g"
if is_gnu_sed; then if is_gnu_sed; then
replace_with_debug () { replace_with_debug () {
echo "found: ${2} (`date`)" echo "found: ${2}"
sed -i -E "${1}" "${2}" sed -i -E "${1}" "${2}"
} }
else else
replace_with_debug () { replace_with_debug () {
echo "found: ${2} (`date`)" echo "found: ${2}"
sed -i '' -E "${1}" "${2}" sed -i '' -E "${1}" "${2}"
} }
fi fi