From 30d335760f02b6349dc6d682f340bca37f23ce20 Mon Sep 17 00:00:00 2001
From: xianfei <xianfei@bupt.cn>
Date: Fri, 5 Jul 2024 00:14:53 +0800
Subject: [PATCH] test

---
 .github/workflows/main.yml |  2 +-
 dmgcfg.json                | 22 +---------------------
 package.json               |  4 ++--
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2a75483..ac8c84c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -46,7 +46,6 @@ jobs:
         run: |
           python3 -m pip install setuptools
           npm install -g appdmg@0.6.6
-          sed -i '' '137,149d' `npm root -g`/appdmg/lib/appdmg.js
 
       # step3: npm install
       - name: npm install
@@ -67,6 +66,7 @@ jobs:
       - name: build mac app
         if: matrix.os == 'macos-14'
         run: |
+          sed -i '' '137,149d' `npm root -g`/appdmg/lib/appdmg.js
           npm run package:mac64
           npm run dmg
           npm run package:macarm
diff --git a/dmgcfg.json b/dmgcfg.json
index 588bf35..651f34a 100644
--- a/dmgcfg.json
+++ b/dmgcfg.json
@@ -1,21 +1 @@
-{
-  "title": "SysMocap-macOS-arm64",
-  "format": "ULMOT",
-  "contents": [
-    {
-      "x": 448,
-      "y": 344,
-      "type": "link",
-      "path": "/Applications"
-    },
-    {
-      "x": 192,
-      "y": 344,
-      "type": "file",
-      "path": "/Users/xianfei/Documents/GitHub/SysMocap/OutApp/SysMocap-darwin-arm64/SysMocap.app"
-    }
-  ],
-  "background": "/Users/xianfei/Documents/GitHub/SysMocap/node_modules/electron-installer-dmg/resources/mac/background.png",
-  "icon": "/Users/xianfei/Documents/GitHub/SysMocap/icons/sysmocap.icns",
-  "icon-size": 80
-}
\ No newline at end of file
+{"title":"SysMocap-macOS-arm64","format":"ULMO","contents":[{"x":448,"y":344,"type":"link","path":"/Applications"},{"x":192,"y":344,"type":"file","path":"/Users/xianfei/Documents/GitHub/SysMocap/OutApp/SysMocap-darwin-arm64/SysMocap.app"}],"background":"/Users/xianfei/Documents/GitHub/SysMocap/node_modules/electron-installer-dmg/resources/mac/background.png","icon":"/Users/xianfei/Documents/GitHub/SysMocap/icons/sysmocap.icns","icon-size":80}
\ No newline at end of file
diff --git a/package.json b/package.json
index 6e98252..c74b542 100644
--- a/package.json
+++ b/package.json
@@ -12,8 +12,8 @@
     "7z:win64": "7z a -t7z -mx=9 -y ./OutApp/packages/SysMocap-Windows-x64.7z ./OutApp/SysMocap-win32-x64/",
     "7z:winarm": "7z a -t7z -mx=9 -y ./OutApp/packages/SysMocap-Windows-arm64.7z ./OutApp/SysMocap-win32-arm64/",
     "dmgtool": "npm install -g appdmg",
-    "dmg": "node builddmgjsonx86.js && cat dmgcfg.json && appdmg ./dmgcfg.json ./OutApp/packages/SysMocap-macOS-x64.dmg && rm ./dmgcfg.json",
-    "dmgarm": "node builddmgjsonarm.js && cat dmgcfg.json && appdmg ./dmgcfg.json ./OutApp/packages/SysMocap-macOS-arm64.dmg && rm ./dmgcfg.json"
+    "dmg": "node builddmgjsonx86.js && cat dmgcfg.json && node `npm root -g`/appdmg/bin/appdmg.js ./dmgcfg.json ./OutApp/packages/SysMocap-macOS-x64.dmg && rm ./dmgcfg.json",
+    "dmgarm": "node builddmgjsonarm.js && cat dmgcfg.json && node `npm root -g`/appdmg/bin/appdmg.js ./dmgcfg.json ./OutApp/packages/SysMocap-macOS-arm64.dmg && rm ./dmgcfg.json"
   },
   "author": "xianfei",
   "license": "ISC",