Revert "fix(multiple): Change Expand-DarkArchive parameter order (#56)"

This reverts commit 0f0c408.
ScoopInstaller · May 15, 2019 · d390697 · d390697
1 parent 0f0c408
commit d390697
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/bucket/mro.json b/bucket/mro.json
@@ -12,8 +12,8 @@
             "hash": "296ff6358d3d9db6723cc7643778b1bf0cf6a3a7492438db4d3a31037391db56",
             "installer": {
                 "script": [
-                    "Expand-DarkArchive \"$dir\\$fname\" \"$dir\\_tmp\"",
-                    "Expand-MsiArchive \"$dir\\_tmp\\AttachedContainer\\ROpen.msi\" \"$dir\\_tmp\"",
+                    "Expand-DarkArchive \"$dir\\_tmp\" \"$dir\\$fname\" | Out-Null",
+                    "Expand-MsiArchive \"$dir\\_tmp\\AttachedContainer\\ROpen.msi\" \"$dir\\_tmp\" | Out-Null",
                     "movedir \"$dir\\_tmp\\Microsoft\\MRO-$version.0\" \"$dir\" | Out-Null",
                     "Expand-7zipArchive \"$dir\\Setup\\*.cab\" \"$dir\\Setup\"",
                     "Remove-Item \"$dir\\bin\\x64\\Rblas.dll\", \"$dir\\bin\\x64\\Rlapack.dll\" -Force",

diff --git a/bucket/plex-server.json b/bucket/plex-server.json
@@ -7,16 +7,16 @@
         "identifier": "Proprietary",
         "url": "https://support.plex.tv/articles/204096476-license-information/"
     },
-    "url": "https://downloads.plex.tv/plex-media-server-new/1.15.4.994-107756f7e/windows/PlexMediaServer-1.15.4.994-107756f7e-x86.exe",
+    "url": "https://downloads.plex.tv/plex-media-server-new/1.15.4.994-107756f7e/windows/PlexMediaServer-1.15.4.994-107756f7e-x86.exe#/installer.exe",
     "hash": "sha1:caeb12ae1080db20c11a86dba3b3e9b2e7bffc6d",
     "installer": {
         "script": [
             "$extracted = \"$dir\\extracted\"",
             "$msi = \"$dir\\msi\"",
-            "Expand-DarkArchive \"$dir\\$fname\" \"$extracted\"",
+            "Expand-DarkArchive \"$extracted\" \"$dir\\installer.exe\" | Out-Null",
             "Expand-MsiArchive \"$extracted\\AttachedContainer\\pms.msi\" \"$msi\"",
             "Move-Item \"$msi\\Msi\\*\" \"$dir\" -Force",
-            "Remove-Item $extracted, $msi, \"$dir\\$fname\" -Force -Recurse"
+            "Remove-Item $extracted, $msi, \"$dir\\installer.exe\" -Force -Recurse"
         ]
     },
     "bin": [
@@ -36,7 +36,7 @@
         "jsonpath": "$.computer.windows.version"
     },
     "autoupdate": {
-        "url": "https://downloads.plex.tv/plex-media-server-new/$version/windows/PlexMediaServer-$version-x86.exe",
+        "url": "https://downloads.plex.tv/plex-media-server-new/$version/windows/PlexMediaServer-$version-x86.exe#/installer.exe",
         "hash": {
             "url": "https://plex.tv/api/downloads/1.json",
             "jsonpath": "$.computer.Windows.releases..checksum"

diff --git a/bucket/python.json b/bucket/python.json
@@ -15,7 +15,7 @@
     },
     "installer": {
         "script": [
-            "Expand-DarkArchive \"$dir\\$fname\" \"$dir\\_tmp\"",
+            "Expand-DarkArchive \"$dir\\_tmp\" \"$dir\\$fname\" | Out-Null",
             "@('launcher.msi', 'path.msi', 'pip.msi') | ForEach-Object {",
             "    Remove-Item \"$dir\\_tmp\\AttachedContainer\\$_\"",
             "}",