cracked linux

Jigsaw-Code · Mar 14, 2024 · c8c62cc · c8c62cc
1 parent c23c8fe
commit c8c62cc
Show file tree

Hide file tree

Showing 6 changed files with 1,561 additions and 1,145 deletions.
diff --git a/client/package.json b/client/package.json
@@ -143,5 +143,6 @@
       "ios",
       "osx"
     ]
-  }
+  },
+  "main": "output/electron/index.js"
 }
diff --git a/client/src/electron/build_main.action.mjs b/client/src/electron/build_main.action.mjs
@@ -22,7 +22,7 @@ import path from 'path';
 import url from 'url';
 import {getRootDir} from '../build/get_root_dir.mjs';
 
-const ELECTRON_BUILD_DIR = 'build';
+const ELECTRON_BUILD_DIR = 'output';
 const ELECTRON_PLATFORMS = ['linux', 'windows'];
 
 export async function main(...parameters) {

diff --git a/client/src/electron/electron-builder.json b/client/src/electron/electron-builder.json
@@ -1,17 +1,17 @@
 {
-  "files": ["client/build/electron", "client/www", "client/resources/tray", "!node_modules/electron"],
-  "asarUnpack": ["third_party", "client/tools"],
+  "files": ["output/electron", "www", "resources/tray", "!node_modules/electron"],
+  "asarUnpack": ["../third_party", "tools"],
   "artifactName": "Outline-Client.${ext}",
   "directories": {
-    "output": "client/output/dist"
+    "output": "output/dist"
   },
   "linux": {
     "target": {
       "target": "AppImage",
       "arch": ["x64"]
     },
     "files": ["output/icons/png", "output/build/linux", "tools/outline_proxy_controller/dist"],
-    "icon": "build/icons/png",
+    "icon": "output/icons/png",
     "category": "Network"
   },
   "win": {
@@ -23,11 +23,11 @@
     ],
     "files": ["output/build/windows"],
     "icon": "output/icons/win/icon.ico",
-    "sign": "client/src/electron/windows/electron_builder_signing_plugin.cjs",
+    "sign": "src/electron/windows/electron_builder_signing_plugin.cjs",
     "signingHashAlgorithms": ["sha256"]
   },
   "nsis": {
     "perMachine": true,
-    "include": "client/src/electron/custom_install_steps.nsh"
+    "include": "src/electron/custom_install_steps.nsh"
   }
 }
diff --git a/client/src/electron/webpack_electron_main.mjs b/client/src/electron/webpack_electron_main.mjs
@@ -49,7 +49,7 @@ export default ({sentryDsn, appVersion}) => [
     ],
     output: {
       filename: 'index.js',
-      path: path.resolve(__dirname, '..', '..', 'build', 'electron', 'electron'),
+      path: path.resolve(__dirname, '..', '..', 'output', 'electron'),
     },
   },
   {
@@ -70,7 +70,7 @@ export default ({sentryDsn, appVersion}) => [
     },
     output: {
       filename: 'preload.js',
-      path: path.resolve(__dirname, '..', '..', 'build', 'electron', 'electron'),
+      path: path.resolve(__dirname, '..', '..', 'output', 'electron'),
     },
   },
 ];