From 5453e4bf35041d43a465d89e63aee2d08971ec71 Mon Sep 17 00:00:00 2001
From: Jerome Thayananthajothy <tjthavarshan@gmail.com>
Date: Thu, 5 Sep 2024 05:16:24 +0100
Subject: [PATCH] Update forge.config.ts to fix asset path for ffmpeg.exe

---
 forge.config.ts         | 21 ++-------------------
 package-lock.json       |  1 -
 package.json            |  1 -
 scripts/postinstall.mjs |  4 ++--
 4 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/forge.config.ts b/forge.config.ts
index 1d0142d..6526b34 100644
--- a/forge.config.ts
+++ b/forge.config.ts
@@ -70,24 +70,7 @@ const config: ForgeConfig = {
         certPass: process.env.CERT_PASSWORD,
         windowsKit: process.env.WINDOWS_KIT_PATH,
         icon: path.resolve(iconDir, 'icon.ico'),
-        assets: [
-          {
-            path: path.resolve(__dirname, 'node_modules/ffmpeg-static/ffmpeg.exe'),
-            target: 'resources/ffmpeg.exe'
-          },
-          {
-            path: path.resolve(__dirname, 'node_modules/ffprobe-static/ffprobe.exe'),
-            target: 'resources/ffprobe.exe'
-          }
-        ],
-        capabilities: [
-          'internetClient',
-          'privateNetworkClientServer',
-          'documentsLibrary',
-          'picturesLibrary',
-          'videosLibrary',
-          'broadFileSystemAccess'
-        ]
+        assets: path.resolve(__dirname, 'node_modules/ffmpeg-static/ffmpeg.exe')
       },
     },
     {
@@ -162,7 +145,7 @@ const config: ForgeConfig = {
   ]
 };
 
-function notarizeMaybe() {
+function notarizeMaybe () {
   if (process.platform !== 'darwin') {
     return;
   }
diff --git a/package-lock.json b/package-lock.json
index 3ff1f66..40a411c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,7 +7,6 @@
     "": {
       "name": "comet",
       "version": "1.0.0",
-      "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
         "archiver": "^7.0.1",
diff --git a/package.json b/package.json
index 097b7d8..29a02ca 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,6 @@
   },
   "main": ".vite/build/main.js",
   "scripts": {
-    "postinstall": "node scripts/postinstall.mjs",
     "start": "electron-forge start",
     "dev": "npm run start",
     "package": "electron-forge package",
diff --git a/scripts/postinstall.mjs b/scripts/postinstall.mjs
index feae746..35924d3 100644
--- a/scripts/postinstall.mjs
+++ b/scripts/postinstall.mjs
@@ -5,8 +5,8 @@ import unzipper from 'unzipper';
 import archiver from 'archiver';
 
 const __dirname = path.dirname(new URL(import.meta.url).pathname);
-const appxFilePath = path.resolve(__dirname, '../out/make/JeromeThayananthajothy.CometApp.appx');
-const outputAppxPath = path.resolve(__dirname, '../out/make/JeromeThayananthajothy.CometApp-modified.appx');
+const appxFilePath = path.resolve(__dirname, '../out/make/appx/x64/JeromeThayananthajothy.CometApp.appx');
+const outputAppxPath = path.resolve(__dirname, '../out/make/appx/x64/JeromeThayananthajothy.CometApp-modified.appx');
 const tempDir = path.resolve(__dirname, '../temp/appx');
 const manifestFile = 'AppxManifest.xml';