Bugfix/356 error arch linux (#357)

* Trying JS electron-builder config * All product info now comes from package.json
digimezzo · Nov 25, 2022 · ab469a5 · ab469a5
1 parent 1b56b75
commit ab469a5
Show file tree

Hide file tree

Showing 6 changed files with 107 additions and 77 deletions.
diff --git a/electron-builder.config.js b/electron-builder.config.js
@@ -0,0 +1,72 @@
+const { getFullVersion } = require('./get-package-information.js');
+
+const config = {
+    appId: "com.digimezzo.dopamine",
+    productName: "Dopamine",
+    fileAssociations: [
+        {
+            name: "MP3 Files",
+            description: "MP3 Files",
+            ext: "mp3",
+            icon: "build/mp3"
+        },
+        {
+            name: "FLAC Files",
+            description: "FLAC Files",
+            ext: "flac",
+            icon: "build/flac"
+        },
+        {
+            name: "OGG Files",
+            description: "OGG Files",
+            ext: "ogg",
+            icon: "build/ogg"
+        },
+        {
+            name: "M4A Files",
+            description: "M4A Files",
+            ext: "m4a",
+            icon: "build/m4a"
+        },
+        {
+            name: "OPUS Files",
+            description: "OPUS Files",
+            ext: "opus",
+            icon: "build/opus"
+        },
+        {
+            name: "WAV Files",
+            description: "WAV Files",
+            ext: "wav",
+            icon: "build/wav"
+        }
+    ],
+    nsis: {
+        shortcutName: "Dopamine 3",
+        perMachine: true
+    },
+    directories: {
+        output: "release"
+    },
+    files: ["**/*"],
+    extraResources: ["LICENSE"],
+    win: {
+        target: ["nsis"],
+        artifactName: `\${productName}-${getFullVersion()}.\${ext}`
+    },
+    mac: {
+        target: ["dmg"],
+        artifactName: `\${productName}-${getFullVersion()}.\${ext}`
+    },
+    linux: {
+        target: ["pacman"],
+        category: "Audio",
+        artifactName: `\${productName}-${getFullVersion()}.\${ext}`,
+        desktop: {
+            Name: "Dopamine 3",
+            Terminal: "false"
+        }
+    }
+};
+
+module.exports = config;
diff --git a/electron-builder.json b/electron-builder.json
diff --git a/get-package-information.js b/get-package-information.js
@@ -0,0 +1,22 @@
+function getName(){
+    return require('./package.json').name;
+}
+
+function getFullVersion() {
+    const version = require('./package.json').version;
+    const versionSuffix = require('./package.json').versionSuffix;
+
+    if(versionSuffix === ""){
+        return version;
+    }
+
+    return version + "-" + versionSuffix;
+}
+
+function getCopyright(){
+    return require('./package.json').copyright;
+}
+
+module.exports.getName = getName;
+module.exports.getFullVersion = getFullVersion;
+module.exports.getCopyright = getCopyright;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,8 @@
 {
     "name": "Dopamine",
-    "version": "3.0.0-preview.19",
+    "version": "3.0.0",
+    "versionSuffix": "preview.19",
+    "copyright": "Copyright Digimezzo Ⓒ 2014 - 2022",
     "description": "Audio player",
     "homepage": "https://github.com/digimezzo/dopamine",
     "author": {
@@ -29,9 +31,9 @@
         "electron:serve-tsc": "tsc -p tsconfig-serve.json",
         "electron:serve": "wait-on http-get://localhost:4200/ && npm run electron:serve-tsc && electron . --serve --remote-debugging-port=9222",
         "electron:local": "npm run build:prod && electron .",
-        "electron:linux": "npm run build:prod && electron-builder build --linux",
-        "electron:windows": "npm run build:prod && electron-builder build --windows",
-        "electron:mac": "npm run build:prod && electron-builder build --mac",
+        "electron:linux": "npm run build:prod && electron-builder build --linux --config electron-builder.config.js",
+        "electron:windows": "npm run build:prod && electron-builder build --windows --config electron-builder.config.js",
+        "electron:mac": "npm run build:prod && electron-builder build --mac --config electron-builder.config.js",
         "version": "conventional-changelog -i CHANGELOG.md -s -r 0 && git add CHANGELOG.md",
         "rebuild-sqlite": "./node_modules/.bin/electron-rebuild -f -o better-sqlite3",
         "test": "npx jest -w 1 --verbose --noStackTrace",

diff --git a/src/app/common/application/product-information.ts b/src/app/common/application/product-information.ts
@@ -1,6 +1,8 @@
+const { getName, getFullVersion, getCopyright } = require('../../../../get-package-information.js');
+
 export class ProductInformation {
-    public static readonly applicationName: string = require('../../../../package.json').name;
-    public static readonly applicationVersion: string = require('../../../../package.json').version;
-    public static readonly applicationCopyright: string = 'Copyright Digimezzo Ⓒ 2014 - 2022';
+    public static readonly applicationName: string = getName();
+    public static readonly applicationVersion: string = getFullVersion();
+    public static readonly applicationCopyright: string = getCopyright();
     public static readonly releasesDownloadUrl: string = 'https://github.com/digimezzo/dopamine/releases/';
 }