fix(electron): detect dk by checking file existence instead of PATH

Author: notdp

electron/electron-builder.yml

@@ -0,0 +1,58 @@
+appId: io.oroio.desktop
+productName: oroio
+copyright: Copyright © 2024
+
+directories:
+  output: release
+  buildResources: assets
+
+files:
+  - dist/**/*
+  - package.json
+
+extraResources:
+  - from: ../web/dist
+    to: web
+  - from: assets
+    to: assets
+
+mac:
+  category: public.app-category.developer-tools
+  icon: ../assets/icon.icns
+  hardenedRuntime: true
+  gatekeeperAssess: false
+  entitlements: entitlements.mac.plist
+  entitlementsInherit: entitlements.mac.plist
+  artifactName: ${productName}-${version}-${arch}.${ext}
+  target:
+    - target: dmg
+      arch:
+        - arm64
+
+dmg:
+  sign: false
+  contents:
+    - x: 130
+      y: 220
+    - x: 410
+      y: 220
+      type: link
+      path: /Applications
+
+linux:
+  target:
+    - AppImage
+  category: Development
+  icon: ../assets/icons
+  artifactName: ${productName}-${version}-x86_64.${ext}
+
+win:
+  target:
+    - nsis
+  icon: assets/icon.ico
+  artifactName: ${productName}-${version}-x86_64.${ext}
+
+nsis:
+  oneClick: false
+  perMachine: false
+  allowToChangeInstallationDirectory: true

electron/main/ipc.ts

@@ -2,7 +2,7 @@ import { ipcMain, BrowserWindow, shell } from 'electron';
 import * as fs from 'fs/promises';
 import * as path from 'path';
 import * as os from 'os';
-import { exec } from 'child_process';
+
 import {
   getKeyList,
   getCurrentKey,
@@ -365,15 +365,24 @@ Droid instructions here.
     await shell.openPath(filePath);
   });
 
-  // dk CLI check
+  // dk CLI check - Windows: Get-Command, macOS/Linux: check file directly (GUI apps don't inherit terminal PATH)
   ipcMain.handle('dk:check', async (): Promise<{ installed: boolean; installCmd: string; platform: string }> => {
     const platform = os.platform();
-    const cmd = platform === 'win32'
-      ? 'powershell -NoProfile -Command "if (Get-Command dk -ErrorAction SilentlyContinue) { exit 0 } else { exit 1 }"'
-      : 'which dk';
-    const installed = await new Promise<boolean>((resolve) => {
-      exec(cmd, (error) => resolve(!error));
-    });
+    let installed = false;
+    if (platform === 'win32') {
+      const { exec } = await import('child_process');
+      installed = await new Promise<boolean>((resolve) => {
+        exec('powershell -NoProfile -Command "if (Get-Command dk -ErrorAction SilentlyContinue) { exit 0 } else { exit 1 }"',
+          (error) => resolve(!error));
+      });
+    } else {
+      try {
+        await fs.access(path.join(os.homedir(), '.local', 'bin', 'dk'));
+        installed = true;
+      } catch {
+        // file not found
+      }
+    }
     const installCmd = platform === 'win32'
       ? 'irm https://raw.githubusercontent.com/notdp/oroio/main/install.ps1 | iex'
       : 'curl -fsSL https://raw.githubusercontent.com/notdp/oroio/main/install.sh | bash';

electron/package.json

@@ -30,85 +30,5 @@
     "electron": "^33.4.0",
     "electron-builder": "^26.0.0",
     "typescript": "^5.7.3"
-  },
-  "build": {
-    "appId": "io.oroio.desktop",
-    "productName": "oroio",
-    "directories": {
-      "output": "release",
-      "buildResources": "assets"
-    },
-    "files": [
-      "dist/**/*",
-      "../web/dist/**/*"
-    ],
-    "extraResources": [
-      {
-        "from": "../web/dist",
-        "to": "web"
-      },
-      {
-        "from": "assets",
-        "to": "assets"
-      }
-    ],
-    "mac": {
-      "category": "public.app-category.developer-tools",
-      "icon": "../assets/icon.icns",
-      "artifactName": "${productName}-${version}-${arch}.${ext}",
-      "target": [
-        {
-          "target": "dmg",
-          "arch": [
-            "arm64"
-          ]
-        }
-      ]
-    },
-    "linux": {
-      "target": [
-        {
-          "target": "AppImage",
-          "arch": [
-            "x64"
-          ]
-        }
-      ],
-      "category": "Development",
-      "icon": "../assets/icons",
-      "artifactName": "${productName}-${version}-x64.${ext}"
-    },
-    "win": {
-      "icon": "assets/icon.ico",
-      "artifactName": "${productName}-${version}-x64.${ext}",
-      "target": [
-        {
-          "target": "nsis",
-          "arch": [
-            "x64"
-          ]
-        }
-      ]
-    },
-    "nsis": {
-      "oneClick": false,
-      "perMachine": false,
-      "allowToChangeInstallationDirectory": true,
-      "artifactName": "${productName}-${version}-x64.${ext}"
-    },
-    "dmg": {
-      "contents": [
-        {
-          "x": 130,
-          "y": 220
-        },
-        {
-          "x": 410,
-          "y": 220,
-          "type": "link",
-          "path": "/Applications"
-        }
-      ]
-    }
   }
 }