From 1e6e9fd8e429892897a3c488b3ab2eb5901f73c7 Mon Sep 17 00:00:00 2001
From: Richard Kuhnt <r15ch13+git@gmail.com>
Date: Sun, 12 May 2019 11:59:57 +0200
Subject: [PATCH] Update manifest to use new Expand-Functions

---
 bucket/lua-for-windows.json | 1 -
 bucket/mro.json             | 7 +++----
 bucket/plex-server.json     | 5 ++---
 bucket/python.json          | 5 ++---
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/bucket/lua-for-windows.json b/bucket/lua-for-windows.json
index 4a416896a3..7020cfaecd 100644
--- a/bucket/lua-for-windows.json
+++ b/bucket/lua-for-windows.json
@@ -13,7 +13,6 @@
     "env_set": {
         "LUA_DEV": "$dir"
     },
-    "depends": "innounp",
     "checkver": {
         "url": "https://github.com/rjpcomputing/luaforwindows/releases/latest",
         "re": "/releases/tag/v([\\d.\\-]+)"
diff --git a/bucket/mro.json b/bucket/mro.json
index 0cb74e8774..4ef16dc1c6 100644
--- a/bucket/mro.json
+++ b/bucket/mro.json
@@ -3,7 +3,6 @@
     "description": "Microsoft R Open: The enhanced distribution of R from Microsoft Corporation",
     "homepage": "https://mran.microsoft.com/",
     "license": "GPL-2.0-only",
-    "depends": "dark",
     "suggest": {
         "Visual C/C++ Runtime 2015": "extras/vcredist2015"
     },
@@ -13,10 +12,10 @@
             "hash": "296ff6358d3d9db6723cc7643778b1bf0cf6a3a7492438db4d3a31037391db56",
             "installer": {
                 "script": [
-                    "&(file_path dark dark.exe) -nologo -x \"$dir\\_tmp\" \"$dir\\$fname\" | Out-Null",
-                    "Expand-MSIArchive \"$dir\\_tmp\\AttachedContainer\\ROpen.msi\" \"$dir\\_tmp\" | Out-Null",
+                    "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\"",
+                    "Expand-7zipArchive \"$dir\\Setup\\*.cab\" \"$dir\\Setup\"",
                     "Remove-Item \"$dir\\bin\\x64\\Rblas.dll\", \"$dir\\bin\\x64\\Rlapack.dll\" -Force",
                     "movedir \"$dir\\Setup\\bin\\x64\" \"$dir\\bin\\x64\" | Out-Null",
                     "movedir \"$dir\\Setup\\library\" \"$dir\\library\" | Out-Null",
diff --git a/bucket/plex-server.json b/bucket/plex-server.json
index 24e95c184f..5f614dd1e8 100644
--- a/bucket/plex-server.json
+++ b/bucket/plex-server.json
@@ -7,15 +7,14 @@
         "identifier": "Proprietary",
         "url": "https://support.plex.tv/articles/204096476-license-information/"
     },
-    "depends": "dark",
     "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\"",
-            "&(file_path dark dark.exe) -nologo -x \"$extracted\" \"$dir\\installer.exe\" | Out-Null",
-            "extract_msi \"$extracted\\AttachedContainer\\pms.msi\" \"$msi\"",
+            "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\\installer.exe\" -Force -Recurse"
         ]
diff --git a/bucket/python.json b/bucket/python.json
index a03f4864a6..4699186f8b 100644
--- a/bucket/python.json
+++ b/bucket/python.json
@@ -3,7 +3,6 @@
     "description": "A programming language that lets you work quickly and integrate systems more effectively.",
     "license": "Python-2.0",
     "version": "3.7.3",
-    "depends": "dark",
     "architecture": {
         "64bit": {
             "url": "https://www.python.org/ftp/python/3.7.3/python-3.7.3-amd64.exe",
@@ -16,11 +15,11 @@
     },
     "installer": {
         "script": [
-            "&(file_path dark dark.exe) -nologo -x \"$dir\\_tmp\" \"$dir\\$fname\" | Out-Null",
+            "Expand-DarkArchive \"$dir\\_tmp\" \"$dir\\$fname\" | Out-Null",
             "@('launcher.msi', 'path.msi', 'pip.msi') | ForEach-Object {",
             "    Remove-Item \"$dir\\_tmp\\AttachedContainer\\$_\"",
             "}",
-            "(Get-ChildItem \"$dir\\_tmp\\AttachedContainer\\*.msi\").FullName | ForEach-Object { Expand-MSIArchive $_ \"$dir\" }",
+            "(Get-ChildItem \"$dir\\_tmp\\AttachedContainer\\*.msi\").FullName | ForEach-Object { Expand-MsiArchive $_ \"$dir\" }",
             "Remove-Item \"$dir\\_tmp\", \"$dir\\$fname\" -Force -Recurse",
             "& \"$dir\\python.exe\" -E -s -m ensurepip -U --default-pip | Out-Null",
             "if ($global) {",