From daa8be67b377649c4639b8edbe2c35240ab698a0 Mon Sep 17 00:00:00 2001
From: salman <zaher.salman@psi.ch>
Date: Tue, 17 Jan 2023 13:49:36 +0100
Subject: [PATCH] Prepare for RPMs

---
 .forgeignore |  6 ++++++
 TrimSPlib.js |  8 ++++++--
 package.json | 13 ++++++-------
 3 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 .forgeignore

diff --git a/.forgeignore b/.forgeignore
new file mode 100644
index 0000000..93f868d
--- /dev/null
+++ b/.forgeignore
@@ -0,0 +1,6 @@
+*~
+TrimSPweb.js
+TrimSP.cfg
+ToDo.txt
+#*
+Readme.md
diff --git a/TrimSPlib.js b/TrimSPlib.js
index 65af933..53ae720 100644
--- a/TrimSPlib.js
+++ b/TrimSPlib.js
@@ -1051,8 +1051,12 @@ function startSequence(All) {
     if (!webOrApp) {
 	// Check if the trimspNL binary is found
 	if (!fileExists(trimBin)) {
-	    // if not found, try in PATH and hope for the best
-	    trimBin = "trimspNL";
+	    // check if it is in rpm
+	    trimBin = "/usr/lib/TrimSP/resources/app/trimspNL";
+	    if (!fileExists(trimBin)) {
+		// if not found, try in PATH and hope for the best
+		trimBin = "trimspNL";
+	    }
 	}
     
 	// Check if workPath exists otherwise create it
diff --git a/package.json b/package.json
index 14f4098..0c747c3 100644
--- a/package.json
+++ b/package.json
@@ -12,11 +12,11 @@
   "author": "Zaher Salman",
   "license": "GPL2",
   "devDependencies": {
-    "@electron-forge/cli": "^6.0.4",
-    "@electron-forge/maker-deb": "^6.0.4",
-    "@electron-forge/maker-rpm": "^6.0.4",
-    "@electron-forge/maker-squirrel": "^6.0.4",
-    "@electron-forge/maker-zip": "^6.0.4",
+    "@electron-forge/cli": "^6.0.0-beta.57",
+    "@electron-forge/maker-deb": "^6.0.0-beta.57",
+    "@electron-forge/maker-rpm": "^6.0.0-beta.57",
+    "@electron-forge/maker-squirrel": "^6.0.0-beta.57",
+    "@electron-forge/maker-zip": "^6.0.0-beta.57",
     "electron": "^11.2.1"
   },
   "dependencies": {
@@ -26,8 +26,7 @@
   "config": {
     "forge": {
       "packagerConfig": {
-          "icon": "./appicons/icons/png/1024x1024.png",
-	  "extraResource" : "/usr/local/bin/trimspNL",
+      	  "icon": "appicons/icons/png/1024x1024.png"
       },
       "makers": [
         {