Adopt new function naming after decompress refactor

.appveyor.yml

@@ -17,7 +17,10 @@ environment:
 init:
   - ps: |
       (Get-PSProvider 'FileSystem').Home = 'C:\projects\'
-      if(!(Test-Path "$env:SCOOP_HOME")) { git clone -q --depth=1 "https://github.com/lukesampson/scoop" "$env:SCOOP_HOME" }
+      if(!(Test-Path "$env:SCOOP_HOME")) {
+        git clone -q --depth=1 'https://github.com/lukesampson/scoop' "$env:SCOOP_HOME"
+        git clone -q --depth=1 'https://github.com/scoopinstaller/scoop-main' "$env:SCOOP\buckets\main"
+      }
 for:
   - matrix:
       only:

README.md

@@ -1,4 +1,4 @@
-# Scoop Ash258 Bucket [![Build status](https://ci.appveyor.com/api/projects/status/85gmaim6wqk5gc20?svg=true)](https://ci.appveyor.com/project/Ash258/scoop-ash258)
+# Scoop Ash258 Bucket [![Build status](https://ci.appveyor.com/api/projects/status/85gmaim6wqk5gc20/branch/master?svg=true)](https://ci.appveyor.com/project/Ash258/scoop-ash258/branch/master)
 
 `scoop bucket add Ash258 'https://github.com/Ash258/scoop-Ash258.git'`
 

bucket/CCleanerPro.json

@@ -25,7 +25,7 @@
             "}",
             "    # Remove irrelevant files",
             "    # gci because rm does not support placeholders as expected",
-            "Get-ChildItem \"$dir\\`$*\", \"$dir\\uninst.exe\", \"$dir\\CCUpdate.exe\" | Remove-Item -Force -Recurse"
+            "@('$*', 'uninst.exe', 'CCUpdate.exe') | ForEach-Object { Remove-Item \"$dir\\$_\" -Force -Recurse }"
         ]
     },
     "persist": "ccleaner.ini",

bucket/Chrome.json

@@ -15,10 +15,9 @@
     },
     "installer": {
         "script": [
-            "$arch = \"$dir\\chrome.7z\"",
-            "extract_7zip $arch \"$dir\"",
+            "Expand-7ZipArchive \"$dir\\chrome.7z\" \"$dir\" -Removal",
             "Move-Item \"$dir\\Chrome-bin\\*\" \"$dir\"",
-            "Remove-Item $arch, \"$dir\\Chrome-bin\" -Force -Recurse"
+            "Remove-Item \"$dir\\Chrome-bin\" -Force -Recurse"
         ]
     },
     "bin": "chrome.exe",

bucket/CloneApp.json

@@ -7,17 +7,17 @@
     "hash": "md5:d00c8be8377c9ba501d944b6de79905c",
     "extract_dir": "CloneApp",
     "pre_install": [
-        "$file = 'cloneapp.ini'",
+        "$file = 'Data\\cloneapp.ini'",
         "if (-not (Test-Path \"$persist_dir\\$file\")) {",
         "    Write-Host 'File' $file 'does not exists. Creating.' -f Yellow",
         "    $to = \"$(Split-Path \"$dir\")\\current\"",
-        "    $file = \"$dir\\Data\\$file\"",
         "    $CONT = @(",
         "        '[Settings]'",
-        "      , \"ClonePath=$to\\Backup\\\"",
-        "      , \"LogPath=$to\\Backup\\\"",
-        "      , 'EditorPath=$AppEditor$' ",
+        "        \"ClonePath=$to\\Backup\\\"",
+        "        \"LogPath=$to\\Backup\\\"",
+        "        'EditorPath=$AppEditor$' ",
         "    )",
+        "    $file = \"$dir\\$file\"",
         "    New-Item $file -Type File | Out-Null",
         "    Set-Content $file ($CONT -join \"`r`n\") -Encoding Ascii",
         "}"

bucket/FixWin10.json

@@ -7,10 +7,7 @@
     "hash": "40b442c92c7800adf53b6274b6ba54ea6b605eda68772471f2fff0d7f5369bc7",
     "extract_dir": "FixWin 10.0.1.0",
     "installer": {
-        "script": [
-            "$rename = (Get-ChildItem \"$dir\" 'Fix*exe')[0]",
-            "Rename-Item \"$dir\\$rename\" \"$dir\\FixWin.exe\""
-        ]
+        "script": "(Get-ChildItem \"$dir\" 'Fix*exe').Fullname | Rename-Item -NewName 'FixWin.exe'"
     },
     "shortcuts": [
         [

bucket/FixWin7.json

@@ -7,10 +7,7 @@
     "hash": "106a051cabe04661562499115b0ffe6c1687477180399e30ea080e8b4c28e819",
     "extract_dir": "FixWin",
     "installer": {
-        "script": [
-            "$rename = (Get-ChildItem \"$dir\" 'Fix*exe')[0]",
-            "Rename-Item \"$dir\\$rename\" \"$dir\\FixWin.exe\""
-        ]
+        "script": "(Get-ChildItem \"$dir\" 'Fix*exe').Fullname | Rename-Item -NewName 'FixWin.exe'"
     },
     "shortcuts": [
         [

bucket/FixWin8.json

@@ -7,10 +7,7 @@
     "hash": "9a1085288b9c27891733d8200d4b8e654bcfdd1a2e63ee5f069746b26539da19",
     "extract_dir": "FixWin 2.2 for Windows 8.1",
     "installer": {
-        "script": [
-            "$rename = (Get-ChildItem \"$dir\" 'Fix*exe')[0]",
-            "Rename-Item \"$dir\\$rename\" \"$dir\\FixWin.exe\""
-        ]
+        "script": "(Get-ChildItem \"$dir\" 'Fix*exe').Fullname | Rename-Item -NewName 'FixWin.exe'"
     },
     "shortcuts": [
         [

bucket/Origin.json

@@ -6,10 +6,7 @@
     "url": "https://download.dm.origin.com/origin/live/OriginSetup.exe#/cosi.7z",
     "extract_dir": "update",
     "installer": {
-        "script": [
-            "extract_7zip \"$dir\\OriginUpdate*.zip\" \"$dir\"",
-            "Remove-Item \"$dir\\OriginUpdate*.zip\" -Force"
-        ]
+        "script": "Expand-7zipArchive \"$dir\\OriginUpdate*.zip\" \"$dir\" -Removal"
     },
     "shortcuts": [
         [

bucket/SaveWizardForPS4.json

@@ -6,10 +6,9 @@
     "hash": "3e99c8f092c261dbeba70a980447fbb094b9ccdd22253572e0c50387aecb85b7",
     "installer": {
         "script": [
-            "$installer = \"$dir\\swps4max.msi\"",
-            "extract_msi $installer \"$dir\\cosi\"",
+            "Expand-MSIArchive \"$dir\\swps4max.msi\" \"$dir\\cosi\" -Removal",
             "Move-Item \"$dir\\cosi\\PFiles\\DataPower\\Save Wizard for PS4 MAX\\*\" \"$dir\"",
-            "Remove-Item \"$dir\\cosi\", $installer -Force -Recurse"
+            "Remove-Item \"$dir\\cosi\" -Force -Recurse"
         ]
     },
     "shortcuts": [

bucket/SystemNinja.json

@@ -19,8 +19,7 @@
         "    New-Item \"$dir\\plugins\" -Type Directory | Out-Null",
         "    download 'https://singularlabs.com/download/11036/' 'Registry.zip'",
         "    download 'https://singularlabs.com/download/10456/' 'ServiceRegistry.zip'",
-        "    extract_7zip \"$dir\\plugins\\*.zip\" \"$dir\\plugins\"",
-        "    Remove-Item \"$dir\\plugins\\*.zip\" -Force",
+        "    Expand-7zipArchive \"$dir\\plugins\\*.zip\" \"$dir\\plugins\" -Removal",
         "}"
     ],
     "innosetup": true,

bucket/TotalCommander.json

@@ -31,9 +31,9 @@
     },
     "installer": {
         "script": [
-            "extract_7zip \"$dir\\INSTALL.CAB\" \"$dir\\cosi\"",
+            "Expand-7zipArchive \"$dir\\INSTALL.CAB\" \"$dir\\cosi\" -Removal",
             "Get-ChildItem \"$dir\" -Exclude cosi | Remove-Item -Force -Recurse",
-            "Move-Item -Path \"$dir\\cosi\\*\" -Destination \"$dir\"",
+            "Move-Item \"$dir\\cosi\\*\" \"$dir\"",
             "Remove-Item \"$dir\\cosi\", \"$dir\\e\", \"$dir\\d\" -Force -Recurse",
             "    # Creating default settings",
             "function CreateFile([String] $file, [String] $content = $null) {",

bucket/UltimateWindowsTweaker.json

@@ -7,10 +7,7 @@
     "hash": "e6aafedffc3097e5ad5e528a7f44731e673c49c19a49fee0c3a301cb0a35615e",
     "extract_dir": "UWT4\\Ultimate Windows Tweaker 4.5",
     "installer": {
-        "script": [
-            "$rename = (Get-ChildItem \"$dir\" 'Ultimate Windows*exe')[0]",
-            "Rename-Item \"$dir\\$rename\" \"$dir\\UWT.exe\""
-        ]
+        "script": "(Get-ChildItem \"$dir\" 'Ultimate Windows*exe').Fullname | Rename-Item -NewName 'UWT.exe'"
     },
     "shortcuts": [
         [

bucket/UltimateWindowsTweaker2.json

@@ -7,10 +7,7 @@
     "hash": "7efe77cb948eed5d968e3355e94f3db1dba78112b49e6ad5129aa37383e974ea",
     "extract_dir": "UWT v2.2",
     "installer": {
-        "script": [
-            "$rename = (Get-ChildItem \"$dir\" 'Ultimate Windows*exe')[0]",
-            "Rename-Item \"$dir\\$rename\" \"$dir\\UWT.exe\""
-        ]
+        "script": "(Get-ChildItem \"$dir\" 'Ultimate Windows*exe').Fullname | Rename-Item -NewName 'UWT.exe'"
     },
     "shortcuts": [
         [

bucket/UltimateWindowsTweaker3.json

@@ -7,10 +7,7 @@
     "hash": "68eabde2c393601fde86ec8c67a2c4ae997e0a557b1b4b583ead765e761b101c",
     "extract_dir": "Ultimate Windows Tweaker 3.1.2.0",
     "installer": {
-        "script": [
-            "$rename = (Get-ChildItem \"$dir\" 'Ultimate Windows*exe')[0]",
-            "Rename-Item \"$dir\\$rename\" \"$dir\\UWT.exe\""
-        ]
+        "script": "(Get-ChildItem \"$dir\" 'Ultimate Windows*exe').Fullname | Rename-Item -NewName 'UWT.exe'"
     },
     "shortcuts": [
         [

bucket/Uplay.json

@@ -4,14 +4,7 @@
     "homepage": "https://uplay.ubi.com/",
     "license": "Freeware",
     "url": "https://ubistatic3-a.akamaihd.net/orbit/launcher_installer/UplayInstaller.exe#/cosi.7z",
-    "pre_install": [
-        "Remove-Item \"$dir\\`$PLUGINSDIR\" -Force -Recurse",
-        "$fold = \"cache\\installers\"",
-        "if (-not (Test-Path \"$persist_dir\\$fold\")) {",
-        "    Write-Host 'No' $fold 'folder exists. Creating.' -f Yellow",
-        "    New-Item \"$dir\\$fold\" -Type Directory -Force | Out-Null",
-        "}"
-    ],
+    "post_install": "Remove-Item \"$dir\\`$PLUGINSDIR\" -Force -Recurse",
     "persist": [
         "games",
         "savegames",

bucket/VMware-unlocker.json

@@ -13,7 +13,7 @@
             "hash": "ef7e60303a2f596ad280b73d6a01290ed9367e4c97a6d21a80c7d056fea4bae9"
         }
     },
-    "pre_install": "Remove-Item \"$dir\\*.py\", \"$dir\\*.sh\", \"$dir\\LICENSE\" -Force",
+    "pre_install": "@('*.py', '*.sh', 'LICENSE') | ForEach-Object { Remove-Item \"$dir\\$_\" -Force }",
     "installer": {
         "file": "win-install.cmd"
     },