From b076169f23d9f75cf6f79cf62a9c8f3f5625a299 Mon Sep 17 00:00:00 2001 From: TheKing-OfTime Date: Mon, 27 Jan 2025 07:19:50 +0300 Subject: [PATCH 1/6] Fix log string --- repack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repack.sh b/repack.sh index 62bf68e..e28dd79 100755 --- a/repack.sh +++ b/repack.sh @@ -73,7 +73,7 @@ find "./" -type f \( -name "*.js" -o -name "*.js.map" \) -print0 | while IFS= re sed -i 's/l.isLinuxApplication/(window.CUSTOM_TITLE_BAR)/g' "$file" sed -i 's/o.isLinuxApplication/(window.CUSTOM_TITLE_BAR)/g' "$file" done -echo "OS spoofed" +echo ".js chunks patched" # fixing titile echo "Fixing Title" From 013d00a5e9f2bd06e4cf52c13f592ab5ef2b3ee5 Mon Sep 17 00:00:00 2001 From: TheKing-OfTime Date: Mon, 27 Jan 2025 07:40:50 +0300 Subject: [PATCH 2/6] Add patch to unlock DevPanel if DevTools enabled --- patches/0003-Expose-Dev-Tools-In-Main-World.patch | 12 ++++++++++++ repack.sh | 1 + 2 files changed, 13 insertions(+) create mode 100644 patches/0003-Expose-Dev-Tools-In-Main-World.patch diff --git a/patches/0003-Expose-Dev-Tools-In-Main-World.patch b/patches/0003-Expose-Dev-Tools-In-Main-World.patch new file mode 100644 index 0000000..83dce24 --- /dev/null +++ b/patches/0003-Expose-Dev-Tools-In-Main-World.patch @@ -0,0 +1,12 @@ +diff --git a/main/config.js b/main/config.js +--- a/main/lib/preload.js ++++ b/main/lib/preload.js +@@ -7,6 +7,8 @@ const deviceInfo_js_1 = require("./deviceInfo.js"); + const theme_js_1 = require("../types/theme.js"); + const hostnamePatterns_js_1 = require("../constants/hostnamePatterns.js"); + const deviceInfo = (0, deviceInfo_js_1.getDeviceInfo)(); ++const devTools = process.env.DEV_TOOLS && process.env.DEV_TOOLS > 0; ++electron_1.contextBridge.exposeInMainWorld('IS_DEVTOOLS_ENABLED', devTools); + electron_1.contextBridge.exposeInMainWorld('VERSION', String(config_js_1.config.buildInfo.VERSION)); + electron_1.contextBridge.exposeInMainWorld('BRANCH', String(config_js_1.config.buildInfo.BRANCH)); + electron_1.contextBridge.exposeInMainWorld('PLATFORM', deviceInfo.os); diff --git a/repack.sh b/repack.sh index e28dd79..9064faf 100755 --- a/repack.sh +++ b/repack.sh @@ -72,6 +72,7 @@ find "./" -type f \( -name "*.js" -o -name "*.js.map" \) -print0 | while IFS= re # Use 'sed' to perform the replacement in-place sed -i 's/l.isLinuxApplication/(window.CUSTOM_TITLE_BAR)/g' "$file" sed -i 's/o.isLinuxApplication/(window.CUSTOM_TITLE_BAR)/g' "$file" + sed -i 's/panel:!1,allowOverwriteExperiments:!1/panel:window.IS_DEVTOOLS_ENABLED??!1,allowOverwriteExperiments:window.IS_DEVTOOLS_ENABLED??!1/g' "$file" done echo ".js chunks patched" From 605c90abf7014e6dc654ec502c3d36f693658ce9 Mon Sep 17 00:00:00 2001 From: TheKing-OfTime Date: Mon, 27 Jan 2025 07:42:24 +0300 Subject: [PATCH 3/6] Fix diff cmd paths --- patches/0003-Expose-Dev-Tools-In-Main-World.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/0003-Expose-Dev-Tools-In-Main-World.patch b/patches/0003-Expose-Dev-Tools-In-Main-World.patch index 83dce24..cb6f621 100644 --- a/patches/0003-Expose-Dev-Tools-In-Main-World.patch +++ b/patches/0003-Expose-Dev-Tools-In-Main-World.patch @@ -1,4 +1,4 @@ -diff --git a/main/config.js b/main/config.js +diff --git a/main/lib/preload.js b/main/lib/preload.js --- a/main/lib/preload.js +++ b/main/lib/preload.js @@ -7,6 +7,8 @@ const deviceInfo_js_1 = require("./deviceInfo.js"); From db6006bbf1a61276cbf80df5a7f9b4d7d94c6d3f Mon Sep 17 00:00:00 2001 From: TheKing-OfTime Date: Mon, 27 Jan 2025 09:36:26 +0300 Subject: [PATCH 4/6] Try to fix patches conflict --- patches/0003-Expose-Dev-Tools-In-Main-World.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/patches/0003-Expose-Dev-Tools-In-Main-World.patch b/patches/0003-Expose-Dev-Tools-In-Main-World.patch index cb6f621..8e22af7 100644 --- a/patches/0003-Expose-Dev-Tools-In-Main-World.patch +++ b/patches/0003-Expose-Dev-Tools-In-Main-World.patch @@ -1,12 +1,12 @@ diff --git a/main/lib/preload.js b/main/lib/preload.js --- a/main/lib/preload.js +++ b/main/lib/preload.js -@@ -7,6 +7,8 @@ const deviceInfo_js_1 = require("./deviceInfo.js"); - const theme_js_1 = require("../types/theme.js"); - const hostnamePatterns_js_1 = require("../constants/hostnamePatterns.js"); - const deviceInfo = (0, deviceInfo_js_1.getDeviceInfo)(); +@@ -25,6 +25,8 @@ electron_1.contextBridge.exposeInMainWorld('desktopEvents', { + return electron_1.ipcRenderer.invoke(name, ...args); + } + }); +const devTools = process.env.DEV_TOOLS && process.env.DEV_TOOLS > 0; +electron_1.contextBridge.exposeInMainWorld('IS_DEVTOOLS_ENABLED', devTools); - electron_1.contextBridge.exposeInMainWorld('VERSION', String(config_js_1.config.buildInfo.VERSION)); - electron_1.contextBridge.exposeInMainWorld('BRANCH', String(config_js_1.config.buildInfo.BRANCH)); - electron_1.contextBridge.exposeInMainWorld('PLATFORM', deviceInfo.os); + window.document.addEventListener('DOMContentLoaded', () => { + const theme = (0, getInitialTheme_js_1.getInitialTheme)(); + if (hostnamePatterns_js_1.applicationHostnamePattern.test(window.location.hostname)) { From 378b009029c8b37b180b9bdcba0a8c2ae3114d9c Mon Sep 17 00:00:00 2001 From: TheKing-OfTime Date: Mon, 27 Jan 2025 09:50:55 +0300 Subject: [PATCH 5/6] Combine .patch files --- patches/0002-Custom-title-bar.patch | 4 +++- patches/0003-Expose-Dev-Tools-In-Main-World.patch | 12 ------------ 2 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 patches/0003-Expose-Dev-Tools-In-Main-World.patch diff --git a/patches/0002-Custom-title-bar.patch b/patches/0002-Custom-title-bar.patch index b006eea..c6e1e07 100644 --- a/patches/0002-Custom-title-bar.patch +++ b/patches/0002-Custom-title-bar.patch @@ -42,16 +42,18 @@ diff --git a/main/lib/createWindow.js b/main/lib/createWindow.js diff --git a/main/lib/preload.js b/main/lib/preload.js --- a/main/lib/preload.js +++ b/main/lib/preload.js -@@ -7,10 +7,12 @@ const deviceInfo_js_1 = require("./deviceInfo.js"); +@@ -7,10 +7,14 @@ const deviceInfo_js_1 = require("./deviceInfo.js"); const theme_js_1 = require("../types/theme.js"); const hostnamePatterns_js_1 = require("../constants/hostnamePatterns.js"); const deviceInfo = (0, deviceInfo_js_1.getDeviceInfo)(); +const customTitleBar = process.env.CUSTOM_TITLE_BAR && process.env.CUSTOM_TITLE_BAR > 0; ++const devTools = process.env.DEV_TOOLS && process.env.DEV_TOOLS > 0; electron_1.contextBridge.exposeInMainWorld('VERSION', String(config_js_1.config.buildInfo.VERSION)); electron_1.contextBridge.exposeInMainWorld('BRANCH', String(config_js_1.config.buildInfo.BRANCH)); electron_1.contextBridge.exposeInMainWorld('PLATFORM', deviceInfo.os); electron_1.contextBridge.exposeInMainWorld('DEVICE_INFO', deviceInfo); +electron_1.contextBridge.exposeInMainWorld('CUSTOM_TITLE_BAR', customTitleBar); ++electron_1.contextBridge.exposeInMainWorld('IS_DEVTOOLS_ENABLED', devTools); electron_1.contextBridge.exposeInMainWorld('desktopEvents', { send(name, ...args) { electron_1.ipcRenderer.send(name, ...args); diff --git a/patches/0003-Expose-Dev-Tools-In-Main-World.patch b/patches/0003-Expose-Dev-Tools-In-Main-World.patch deleted file mode 100644 index 8e22af7..0000000 --- a/patches/0003-Expose-Dev-Tools-In-Main-World.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/main/lib/preload.js b/main/lib/preload.js ---- a/main/lib/preload.js -+++ b/main/lib/preload.js -@@ -25,6 +25,8 @@ electron_1.contextBridge.exposeInMainWorld('desktopEvents', { - return electron_1.ipcRenderer.invoke(name, ...args); - } - }); -+const devTools = process.env.DEV_TOOLS && process.env.DEV_TOOLS > 0; -+electron_1.contextBridge.exposeInMainWorld('IS_DEVTOOLS_ENABLED', devTools); - window.document.addEventListener('DOMContentLoaded', () => { - const theme = (0, getInitialTheme_js_1.getInitialTheme)(); - if (hostnamePatterns_js_1.applicationHostnamePattern.test(window.location.hostname)) { From 80df8fbc933fab872a6b0520c7392cfa6705fb84 Mon Sep 17 00:00:00 2001 From: TheKing-OfTime Date: Mon, 27 Jan 2025 10:55:55 +0300 Subject: [PATCH 6/6] Combine .patch files --- ...bar.patch => 0002-Custom-title-bar-and-Dev-Tools-expose.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename patches/{0002-Custom-title-bar.patch => 0002-Custom-title-bar-and-Dev-Tools-expose.patch} (100%) diff --git a/patches/0002-Custom-title-bar.patch b/patches/0002-Custom-title-bar-and-Dev-Tools-expose.patch similarity index 100% rename from patches/0002-Custom-title-bar.patch rename to patches/0002-Custom-title-bar-and-Dev-Tools-expose.patch