From 3b139263ed6c0be15b9541d7cea9ba305ce7f102 Mon Sep 17 00:00:00 2001 From: pompurin404 Date: Wed, 16 Oct 2024 14:56:30 +0800 Subject: [PATCH] try to use pkg --- .github/workflows/build.yml | 6 +++--- electron-builder.yml | 2 +- scripts/artifact.mjs | 4 ++-- scripts/telegram.mjs | 4 ++-- scripts/updater.mjs | 2 +- src/main/resolve/autoUpdater.ts | 6 +++--- src/main/utils/init.ts | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1b9ddad..f4a5e8c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -200,7 +200,7 @@ jobs: sed -i "" -e "s/productName: mihomo-party/productName: Mihomo Party/" electron-builder.yml pnpm build:mac --${{ matrix.arch }} - name: Generate checksums - run: pnpm checksum .dmg + run: pnpm checksum .pkg - name: Upload Artifacts if: startsWith(github.ref, 'refs/heads/') uses: actions/upload-artifact@v4 @@ -208,7 +208,7 @@ jobs: name: MacOS ${{ matrix.arch }} path: | dist/*.sha256 - dist/*.dmg + dist/*.pkg if-no-files-found: error - name: Publish Release if: startsWith(github.ref, 'refs/tags/v') @@ -216,7 +216,7 @@ jobs: with: files: | dist/*.sha256 - dist/*.dmg + dist/*.pkg body_path: changelog.md token: ${{ secrets.GITHUB_TOKEN }} diff --git a/electron-builder.yml b/electron-builder.yml index 5a48433..643574e 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -38,7 +38,7 @@ nsis: createDesktopShortcut: always mac: target: - - dmg + - pkg entitlementsInherit: build/entitlements.mac.plist extendInfo: - NSCameraUsageDescription: Application requests access to the device's camera. diff --git a/scripts/artifact.mjs b/scripts/artifact.mjs index 772326d..801a111 100644 --- a/scripts/artifact.mjs +++ b/scripts/artifact.mjs @@ -20,8 +20,8 @@ const linuxFiles = [ ] const macosFiles = [ - path.join(GITHUB_WORKSPACE, `mihomo-party-macos-${version}-arm64.dmg`), - path.join(GITHUB_WORKSPACE, `mihomo-party-macos-${version}-x64.dmg`) + path.join(GITHUB_WORKSPACE, `mihomo-party-macos-${version}-arm64.pkg`), + path.join(GITHUB_WORKSPACE, `mihomo-party-macos-${version}-x64.pkg`) ] const windowsFiles = [ diff --git a/scripts/telegram.mjs b/scripts/telegram.mjs index 4638437..f73b364 100644 --- a/scripts/telegram.mjs +++ b/scripts/telegram.mjs @@ -24,8 +24,8 @@ content += '\nWindows7/8：\n' content += `安装版：64位 | 32位\n` content += `便携版：64位 | 32位\n` content += '\nmacOS：\n' -content += `DMG：Intel | Apple Silicon\n` +content += `DMG：Intel | Apple Silicon\n` content += '\nLinux：\n' content += `DEB：64位 | ARM64\n` diff --git a/scripts/updater.mjs b/scripts/updater.mjs index d404d69..8ced64d 100644 --- a/scripts/updater.mjs +++ b/scripts/updater.mjs @@ -17,7 +17,7 @@ changelog += '\n#### Windows7/8：\n\n' changelog += `- 安装版：[64位](${downloadUrl}/mihomo-party-win7-${version}-x64-setup.exe) | [32位](${downloadUrl}/mihomo-party-win7-${version}-ia32-setup.exe)\n\n` changelog += `- 便携版：[64位](${downloadUrl}/mihomo-party-win7-${version}-x64-portable.7z) | [32位](${downloadUrl}/mihomo-party-win7-${version}-ia32-portable.7z)\n\n` changelog += '\n#### macOS：\n\n' -changelog += `- DMG：[Intel](${downloadUrl}/mihomo-party-macos-${version}-x64.dmg) | [Apple Silicon](${downloadUrl}/mihomo-party-macos-${version}-arm64.dmg)\n\n` +changelog += `- DMG：[Intel](${downloadUrl}/mihomo-party-macos-${version}-x64.pkg) | [Apple Silicon](${downloadUrl}/mihomo-party-macos-${version}-arm64.pkg)\n\n` changelog += '\n#### Linux：\n\n' changelog += `- DEB：[64位](${downloadUrl}/mihomo-party-linux-${version}-amd64.deb) | [ARM64](${downloadUrl}/mihomo-party-linux-${version}-arm64.deb)\n\n` changelog += `- RPM：[64位](${downloadUrl}/mihomo-party-linux-${version}-x86_64.rpm) | [ARM64](${downloadUrl}/mihomo-party-linux-${version}-aarch64.rpm)` diff --git a/src/main/resolve/autoUpdater.ts b/src/main/resolve/autoUpdater.ts index 1dfc6b7..835c0bc 100644 --- a/src/main/resolve/autoUpdater.ts +++ b/src/main/resolve/autoUpdater.ts @@ -39,8 +39,8 @@ export async function downloadAndInstallUpdate(version: string): Promise { 'win32-x64': `mihomo-party-windows-${version}-x64-setup.exe`, 'win32-ia32': `mihomo-party-windows-${version}-ia32-setup.exe`, 'win32-arm64': `mihomo-party-windows-${version}-arm64-setup.exe`, - 'darwin-x64': `mihomo-party-macos-${version}-x64.dmg`, - 'darwin-arm64': `mihomo-party-macos-${version}-arm64.dmg` + 'darwin-x64': `mihomo-party-macos-${version}-x64.pkg`, + 'darwin-arm64': `mihomo-party-macos-${version}-arm64.pkg` } let file = fileMap[`${process.platform}-${process.arch}`] if (isPortable()) { @@ -88,7 +88,7 @@ export async function downloadAndInstallUpdate(version: string): Promise { ).unref() app.quit() } - if (file.endsWith('.dmg')) { + if (file.endsWith('.pkg')) { try { const execPromise = promisify(exec) const name = exePath().split('.app')[0].replace('/Applications/', '') diff --git a/src/main/utils/init.ts b/src/main/utils/init.ts index 661b4ff..1f6b734 100644 --- a/src/main/utils/init.ts +++ b/src/main/utils/init.ts @@ -109,7 +109,7 @@ async function cleanup(): Promise { // update cache const files = await readdir(dataDir()) for (const file of files) { - if (file.endsWith('.exe') || file.endsWith('.dmg') || file.endsWith('.7z')) { + if (file.endsWith('.exe') || file.endsWith('.pkg') || file.endsWith('.7z')) { try { await rm(path.join(dataDir(), file)) } catch {