Fix ProtonDrive

Fix to handle duplicate Sha512Checksum key in the update feed
aaronparker · Jul 7, 2024 · eba0564 · eba0564
1 parent 0f0a91c
commit eba0564
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/Evergreen/Apps/Get-ProtonDrive.ps1 b/Evergreen/Apps/Get-ProtonDrive.ps1
@@ -16,9 +16,15 @@ function Get-ProtonDrive {
     }
     $Updates = Invoke-EvergreenRestMethod @params
 
-    # Update feed may include duplicate keys in the JSON
+    # Convert the update JSON string
     if ($Updates -is [System.String]) {
-        $Updates = $Updates | ConvertFrom-Json -ErrorAction "Stop"
+        try {
+            $Updates = $Updates | ConvertFrom-Json -ErrorAction "Continue"
+        }
+        catch {
+            # Update feed may include duplicate keys in the JSON
+            $Updates = $Updates -creplace $res.Get.Update.ReplaceString, "" | ConvertFrom-Json -ErrorAction "Stop"
+        }
     }
 
     # Sort for the latest version

diff --git a/Evergreen/Manifests/ProtonDrive.json b/Evergreen/Manifests/ProtonDrive.json
@@ -4,7 +4,8 @@
     "Get": {
         "Update": {
             "Uri": "https://proton.me/download/drive/windows/version.json",
-            "DatePattern": "yyyy-MM-dd"
+            "DatePattern": "yyyy-MM-dd",
+            "ReplaceString": "(\\s+\\\"Sha512Checksum\\\":\\s+\\\".*\\\"\\,)"
         }
     },
     "Install": {