Fix linux icon

.forgejo/workflows/Linux.yaml

@@ -33,7 +33,7 @@ jobs:
         run: npx cap copy electron
 
       - name: Build
-        run: mkdir -p build && cd build && npx electron-packager ../electron miarven --platform=linux --arch=x64 --icon=../icons/icon.png --overwrite --asar
+        run: mkdir -p build && cd build && npx electron-packager ../electron miarven --platform=linux --arch=x64 --icon=../icons/icon.png --overwrite --asar && cp ../icons/icon.png ./miarven-linux-x64/icon.png && cp ../assets/Miarven.desktop ./miarven-linux-x64/Miarven.desktop
       
       - name: Upload Artifact
         uses: actions/upload-artifact@v3

.forgejo/workflows/Windows.yaml

@@ -33,7 +33,7 @@ jobs:
         run: npx cap copy electron
       
       - name: Build
-        run: mkdir -p build && cd build && npx electron-packager ../electron miarven --platform=win32 --arch=x64 --icon=../icons/icon.png --overwrite --asar
+        run: mkdir -p build && cd build && npx electron-packager ../electron miarven --platform=win32 --arch=x64 --icon=../icons/icon.ico --overwrite --asar
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v3

assets/Miarven.desktop

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Miarven
+Exec=bash -c 'DIR="$(dirname "%k")"; mkdir -p ~/.local/share/icons; cp "$DIR/icon.png" ~/.local/share/icons/olcxjamiarven.png; cd "$DIR" && ./miarven'
+Icon=olcxjamiarven
+Type=Application
+Categories=Internet
+StartupNotify=true
+StartupWMClass=olcxja.miarven

build-linux.sh

@@ -1,3 +1,5 @@
 mkdir build
 cd build
-npx electron-packager ../electron miarven --platform=linux --arch=x64 --icon=../icons/icon.png --overwrite --asar
+npx electron-packager ../electron miarven --platform=linux --arch=x64 --icon=../electron/assets/icon.png --overwrite --asar
+cp ../icons/icon.png ./miarven-linux-x64/icon.png
+cp ../assets/Miarven.desktop ./miarven-linux-x64/Miarven.desktop

build-windows.sh

@@ -1,4 +1,4 @@
 mkdir build
 cd build
-npx electron-packager ../electron miarven --platform=win32 --arch=x64 --icon=../icons/icon.ico --overwrite --asar
+npx electron-packager ../electron miarven --platform=win32 --arch=x64 --icon=../electron/assets/icon.ico --overwrite --asar
 

electron/build/src/setup.js

@@ -83,7 +83,7 @@ class ElectronCapacitorApp {
     async init() {
         var _a;
         const icon = electron_2.nativeImage.createFromPath((0, path_1.join)(electron_2.app.getAppPath(), 'assets', process.platform === 'win32' ? 'icon.ico' : 'icon.png'));
-        const appName = "miarven";
+        const appName = "olcxja.miarven";
         electron_2.app.setName(appName);
         electron_2.app.setAppUserModelId(appName);
         this.mainWindowState = (0, electron_window_state_1.default)({
@@ -93,7 +93,7 @@ class ElectronCapacitorApp {
         // Setup preload script path and construct our main window.
         const preloadPath = (0, path_1.join)(electron_2.app.getAppPath(), 'build', 'src', 'preload.js');
         this.MainWindow = new electron_2.BrowserWindow({
-            icon,
+            icon: icon,
             show: false,
             x: this.mainWindowState.x,
             y: this.mainWindowState.y,

electron/electron-builder.config.json

@@ -19,7 +19,10 @@
   },
   "win": {
     "target": "nsis",
-    "icon": "assets/appIcon.ico"
+    "icon": "assets/icon.ico"
+  },
+  "linux": {
+    "icon": "assets/icon.png"
   },
   "mac": {
     "category": "your.app.category.type",

package-lock.json

@@ -1,11 +1,11 @@
 {
-  "name": "miarven",
+  "name": "olcxja.miarven",
   "version": "1.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "miarven",
+      "name": "olcxja.miarven",
       "version": "1.0.0",
       "license": "AGPL-3.0",
       "dependencies": {

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "miarven",
+  "name": "olcxja.miarven",
   "version": "1.0.0",
   "description": "Larpix client",
   "license": "AGPL-3.0",

sync-project.sh

@@ -14,5 +14,5 @@ npx capacitor-assets generate --android
 magick -background none -density 300 -define icon:auto-resize=256,128,64,48,32,16 ./assets/icon.svg ./icons/icon.ico
 cp ./icons/icon.ico ./electron/assets/icon.ico
 
-magick -background none -density 300 -resize 256x256 ./assets/icon.svg ./icons/icon.png
+magick -background none -density 300 ./assets/icon.svg -resize 256x256 ./icons/icon.png
 cp ./icons/icon.png ./electron/assets/icon.png