From 21a4003892a8787220defbf805de936dbf582a39 Mon Sep 17 00:00:00 2001 From: RuiNtD Date: Mon, 19 Aug 2024 17:11:08 -0600 Subject: [PATCH 1/8] dolphin: Add `extract_dir` --- bucket/dolphin.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bucket/dolphin.json b/bucket/dolphin.json index 2d43fd9589eb..c5a7241253ad 100644 --- a/bucket/dolphin.json +++ b/bucket/dolphin.json @@ -11,6 +11,7 @@ }, "url": "https://dl.dolphin-emu.org/releases/2407/dolphin-2407-x64.7z", "hash": "9283423bc40048ee4fd3531c3fc4ca0799e99d9a2d9295f703683c62a3bc280b", + "extract_dir": "Dolphin-x64", "pre_install": [ "if (!(Test-Path \"$persist_dir\")) {", " New-item \"$persist_dir\" -ItemType Directory | Out-Null", @@ -23,10 +24,10 @@ "}" ], "post_install": "Set-Content -Value $null -Path \"$dir\\portable.txt\"", - "bin": "Dolphin-x64\\Dolphin.exe", + "bin": "Dolphin.exe", "shortcuts": [ [ - "Dolphin-x64\\Dolphin.exe", + "Dolphin.exe", "Dolphin" ] ], From e11bdce4d2a1daa97cd12b538c73600f0fc956c8 Mon Sep 17 00:00:00 2001 From: RuiNtD Date: Mon, 19 Aug 2024 17:12:35 -0600 Subject: [PATCH 2/8] dolphin-beta: Remove due to no longer being a supported channel --- bucket/dolphin-beta.json | 49 ---------------------------------------- 1 file changed, 49 deletions(-) delete mode 100644 bucket/dolphin-beta.json diff --git a/bucket/dolphin-beta.json b/bucket/dolphin-beta.json deleted file mode 100644 index 9c5fdc5af5b7..000000000000 --- a/bucket/dolphin-beta.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "version": "5.0-21460", - "description": "A Nintendo GameCube and Wii emulator, with enhancements and Netplay. (development version)", - "homepage": "https://dolphin-emu.org/", - "license": { - "identifier": "GPL-2.0-or-later", - "url": "https://github.com/dolphin-emu/dolphin/blob/master/COPYING" - }, - "url": "https://dl.dolphin-emu.org/builds/b4/33/dolphin-master-5.0-21460-x64.7z", - "hash": "7364d087c24a846580605acb2d7fdb4ebd1533d0abe23e6228ce9bfed1bdaa11", - "extract_dir": "Dolphin-x64", - "pre_install": [ - "if (!(Test-Path \"$persist_dir\")) {", - " New-item \"$persist_dir\" -ItemType Directory | Out-Null", - " New-item \"$persist_dir\\User\" -ItemType Directory | Out-Null", - " if (Test-Path \"$env:USERPROFILE\\Documents\\Dolphin Emulator\") {", - " Write-host \"Migrating AppData...\" -ForegroundColor yellow", - " Copy-Item -Path \"$env:USERPROFILE\\Documents\\Dolphin Emulator\\*\" -Destination \"$persist_dir\\User\" -Recurse", - " Remove-Item -Path \"$env:USERPROFILE\\Documents\\Dolphin Emulator\" -Recurse", - " }", - "}" - ], - "post_install": "Set-Content -Value $null -Path \"$dir\\portable.txt\"", - "bin": [ - [ - "Dolphin.exe", - "dolphin-beta" - ], - [ - "DolphinTool.exe", - "dolphintool-beta" - ] - ], - "shortcuts": [ - [ - "Dolphin.exe", - "Dolphin (Beta)" - ] - ], - "persist": "User", - "checkver": { - "url": "https://dolphin-emu.org/download/", - "regex": "\\/(?.{2})\\/(?.{2})\\/dolphin-master-(?[\\d\\.]+)-(?[\\d]+)", - "replace": "${major}-${build}" - }, - "autoupdate": { - "url": "https://dl.dolphin-emu.org/builds/$matchRand1/$matchRand2/dolphin-master-$matchMajor-$matchBuild-x64.7z" - } -} From 61ae07452fb8daec624f0833cce78062af5946f2 Mon Sep 17 00:00:00 2001 From: RuiNtD Date: Mon, 19 Aug 2024 17:17:09 -0600 Subject: [PATCH 3/8] dolphin: Add architectures --- bucket/dolphin.json | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/bucket/dolphin.json b/bucket/dolphin.json index c5a7241253ad..26288ee32aa5 100644 --- a/bucket/dolphin.json +++ b/bucket/dolphin.json @@ -9,8 +9,16 @@ "suggest": { "Microsoft Visual C++ Runtime 2019": "extras/vcredist2019" }, - "url": "https://dl.dolphin-emu.org/releases/2407/dolphin-2407-x64.7z", - "hash": "9283423bc40048ee4fd3531c3fc4ca0799e99d9a2d9295f703683c62a3bc280b", + "architecture": { + "64bit": { + "url": "https://dl.dolphin-emu.org/releases/2407/dolphin-2407-x64.7z", + "hash": "9283423bc40048ee4fd3531c3fc4ca0799e99d9a2d9295f703683c62a3bc280b" + }, + "arm64": { + "url": "https://dl.dolphin-emu.org/releases/2407/dolphin-2407-ARM64.7z", + "hash": "94edf7e5a48694e2805edd94e9e4d390b2ec2b837a0d43cd042878c48dbb4b1e" + } + }, "extract_dir": "Dolphin-x64", "pre_install": [ "if (!(Test-Path \"$persist_dir\")) {", @@ -37,6 +45,13 @@ "regex": "https://dl.dolphin-emu.org/releases/(?[\\d]+)/" }, "autoupdate": { - "url": "https://dl.dolphin-emu.org/releases/$version/dolphin-$version-x64.7z" + "architecture": { + "64bit": { + "url": "https://dl.dolphin-emu.org/releases/$version/dolphin-$version-x64.7z" + }, + "arm64": { + "url": "https://dl.dolphin-emu.org/releases/$version/dolphin-$version-ARM64.7z" + } + } } } From ed77a814e61dfe201882e2b472e948ab78f37a67 Mon Sep 17 00:00:00 2001 From: RuiNtD Date: Mon, 19 Aug 2024 17:29:45 -0600 Subject: [PATCH 4/8] dolphin: fix extract_dir on ARM --- bucket/dolphin.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bucket/dolphin.json b/bucket/dolphin.json index 26288ee32aa5..ac5e1c806ec6 100644 --- a/bucket/dolphin.json +++ b/bucket/dolphin.json @@ -12,14 +12,15 @@ "architecture": { "64bit": { "url": "https://dl.dolphin-emu.org/releases/2407/dolphin-2407-x64.7z", - "hash": "9283423bc40048ee4fd3531c3fc4ca0799e99d9a2d9295f703683c62a3bc280b" + "hash": "9283423bc40048ee4fd3531c3fc4ca0799e99d9a2d9295f703683c62a3bc280b", + "extract_dir": "Dolphin-x64" }, "arm64": { "url": "https://dl.dolphin-emu.org/releases/2407/dolphin-2407-ARM64.7z", - "hash": "94edf7e5a48694e2805edd94e9e4d390b2ec2b837a0d43cd042878c48dbb4b1e" + "hash": "94edf7e5a48694e2805edd94e9e4d390b2ec2b837a0d43cd042878c48dbb4b1e", + "extract_dir": "Dolphin-ARM64" } }, - "extract_dir": "Dolphin-x64", "pre_install": [ "if (!(Test-Path \"$persist_dir\")) {", " New-item \"$persist_dir\" -ItemType Directory | Out-Null", From b5a4220ccd54b6f9c8aa328db5cc8ebc8bca9989 Mon Sep 17 00:00:00 2001 From: RuiNtD Date: Mon, 19 Aug 2024 17:47:47 -0600 Subject: [PATCH 5/8] dolphin-dev: Move URL to architecture --- bucket/dolphin-dev.json | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/bucket/dolphin-dev.json b/bucket/dolphin-dev.json index 1da37d2b38b7..afa7ff0aff04 100644 --- a/bucket/dolphin-dev.json +++ b/bucket/dolphin-dev.json @@ -9,9 +9,13 @@ "suggest": { "Microsoft Visual C++ Runtime 2022": "extras/vcredist2022" }, - "url": "https://dl.dolphin-emu.org/builds/2f/c0/dolphin-master-2407-240-x64.7z", - "hash": "8f259a14738d36a68587672dcf3ad790419912d800f399e929310f3c03d8ace1", - "extract_dir": "Dolphin-x64", + "architecture": { + "64bit": { + "url": "https://dl.dolphin-emu.org/builds/2f/c0/dolphin-master-2407-240-x64.7z", + "hash": "8f259a14738d36a68587672dcf3ad790419912d800f399e929310f3c03d8ace1", + "extract_dir": "Dolphin-x64" + } + }, "pre_install": [ "if (!(Test-Path \"$persist_dir\")) {", " New-item \"$persist_dir\" -ItemType Directory | Out-Null", @@ -47,6 +51,11 @@ "replace": "${major}-${build}" }, "autoupdate": { - "url": "https://dl.dolphin-emu.org/builds/$matchRand1/$matchRand2/dolphin-master-$matchMajor-$matchBuild-x64.7z" + "url": "https://dl.dolphin-emu.org/builds/$matchRand1/$matchRand2/dolphin-master-$matchMajor-$matchBuild-x64.7z", + "architecture": { + "64bit": { + "url": "https://dl.dolphin-emu.org/builds/$matchRand1/$matchRand2/dolphin-master-2407-240-x64.7z" + } + } } } From 8c19d815e26db54c15eacbacb3f114ebc030db27 Mon Sep 17 00:00:00 2001 From: RuiNtD Date: Mon, 19 Aug 2024 17:48:13 -0600 Subject: [PATCH 6/8] dolphin: Update pre_install --- bucket/dolphin.json | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/bucket/dolphin.json b/bucket/dolphin.json index ac5e1c806ec6..e249db80de0b 100644 --- a/bucket/dolphin.json +++ b/bucket/dolphin.json @@ -22,14 +22,11 @@ } }, "pre_install": [ - "if (!(Test-Path \"$persist_dir\")) {", - " New-item \"$persist_dir\" -ItemType Directory | Out-Null", - " New-item \"$persist_dir\\User\" -ItemType Directory | Out-Null", - " if (Test-Path \"$env:USERPROFILE\\Documents\\Dolphin Emulator\") {", - " Write-host \"Migrating AppData...\" -ForegroundColor yellow", - " Copy-Item -Path \"$env:USERPROFILE\\Documents\\Dolphin Emulator\\*\" -Destination \"$persist_dir\\User\" -Recurse", - " Remove-Item -Path \"$env:USERPROFILE\\Documents\\Dolphin Emulator\" -Recurse", - " }", + "$appdataPath = \"$Env:AppData\\Dolphin Emulator\"", + "if ((Test-Path -Path $appdataPath\\*) -and (!(Test-Path -Path $persist_dir\\*))) {", + " Write-Warning \"Migrating AppData...\"", + " New-Item -Type Directory -Path $persist_dir\\User -Force | Out-Null", + " Copy-Item -Recurse -Force $appdataPath\\* -Destination $persist_dir\\User\\", "}" ], "post_install": "Set-Content -Value $null -Path \"$dir\\portable.txt\"", From 9da046c0b051c225d75a466e4a35c247d2377d81 Mon Sep 17 00:00:00 2001 From: RuiNtD Date: Mon, 19 Aug 2024 17:50:02 -0600 Subject: [PATCH 7/8] dolphin-dev: Update pre_install --- bucket/dolphin-dev.json | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/bucket/dolphin-dev.json b/bucket/dolphin-dev.json index afa7ff0aff04..7a7af0c1cbc8 100644 --- a/bucket/dolphin-dev.json +++ b/bucket/dolphin-dev.json @@ -17,14 +17,11 @@ } }, "pre_install": [ - "if (!(Test-Path \"$persist_dir\")) {", - " New-item \"$persist_dir\" -ItemType Directory | Out-Null", - " New-item \"$persist_dir\\User\" -ItemType Directory | Out-Null", - " if (Test-Path \"$env:USERPROFILE\\Documents\\Dolphin Emulator\") {", - " Write-host \"Migrating AppData...\" -ForegroundColor yellow", - " Copy-Item -Path \"$env:USERPROFILE\\Documents\\Dolphin Emulator\\*\" -Destination \"$persist_dir\\User\" -Recurse", - " Remove-Item -Path \"$env:USERPROFILE\\Documents\\Dolphin Emulator\" -Recurse", - " }", + "$appdataPath = \"$Env:AppData\\Dolphin Emulator\"", + "if ((Test-Path -Path $appdataPath\\*) -and (!(Test-Path -Path $persist_dir\\*))) {", + " Write-Warning \"Migrating AppData...\"", + " New-Item -Type Directory -Path $persist_dir\\User -Force | Out-Null", + " Copy-Item -Recurse -Force $appdataPath\\* -Destination $persist_dir\\User\\", "}" ], "post_install": "Set-Content -Value $null -Path \"$dir\\portable.txt\"", From bfc2f706cb6175798336076ce00ea4193635040d Mon Sep 17 00:00:00 2001 From: RuiNtD Date: Mon, 19 Aug 2024 17:53:58 -0600 Subject: [PATCH 8/8] dolphin: Add DolphinTool shim --- bucket/dolphin.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bucket/dolphin.json b/bucket/dolphin.json index e249db80de0b..ef319f83872c 100644 --- a/bucket/dolphin.json +++ b/bucket/dolphin.json @@ -30,7 +30,10 @@ "}" ], "post_install": "Set-Content -Value $null -Path \"$dir\\portable.txt\"", - "bin": "Dolphin.exe", + "bin": [ + "Dolphin.exe", + "DolphinTool.exe" + ], "shortcuts": [ [ "Dolphin.exe",