dolphin: Various fixes, including fixing portability (#1208)

* dolphin-beta: Remove due to no longer being a supported channel * dolphin-dev: Move URL to architecture * dolphin-dev: Update pre_install * dolphin: Add `extract_dir` * dolphin: Add architectures * dolphin: fix extract_dir on ARM * dolphin: Update pre_install * dolphin: Add DolphinTool shim
Calinou · Aug 20, 2024 · 5daa3d5 · 5daa3d5
1 parent 600d287
commit 5daa3d5
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 74 deletions.
diff --git a/bucket/dolphin-beta.json b/bucket/dolphin-beta.json
diff --git a/bucket/dolphin-dev.json b/bucket/dolphin-dev.json
@@ -9,18 +9,19 @@
     "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",
-        "   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\"",
@@ -47,6 +48,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"
+            }
+        }
     }
 }
diff --git a/bucket/dolphin.json b/bucket/dolphin.json
@@ -9,24 +9,34 @@
     "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",
+            "extract_dir": "Dolphin-x64"
+        },
+        "arm64": {
+            "url": "https://dl.dolphin-emu.org/releases/2407/dolphin-2407-ARM64.7z",
+            "hash": "94edf7e5a48694e2805edd94e9e4d390b2ec2b837a0d43cd042878c48dbb4b1e",
+            "extract_dir": "Dolphin-ARM64"
+        }
+    },
     "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\"",
-    "bin": "Dolphin-x64\\Dolphin.exe",
+    "bin": [
+        "Dolphin.exe",
+        "DolphinTool.exe"
+    ],
     "shortcuts": [
         [
-            "Dolphin-x64\\Dolphin.exe",
+            "Dolphin.exe",
             "Dolphin"
         ]
     ],
@@ -36,6 +46,13 @@
         "regex": "https://dl.dolphin-emu.org/releases/(?<version>[\\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"
+            }
+        }
     }
 }