Check if 7zip installed via Scoop instead of using 7z.exe from PATH

ScoopInstaller · Aug 8, 2018 · 55ce0c0 · 55ce0c0
1 parent 0f46401
commit 55ce0c0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/core.ps1 b/lib/core.ps1
@@ -113,6 +113,14 @@ function file_path($app, $file) {
     return $null
 }
 
+function 7zip_path() {
+    return (file_path '7zip' '7z.exe')
+}
+
+function 7zip_installed() {
+    return ![String]::IsNullOrWhiteSpace("$(7zip_path)")
+}
+
 function aria2_path() {
     return (file_path 'aria2' 'aria2c.exe')
 }

diff --git a/lib/decompress.ps1 b/lib/decompress.ps1
@@ -1,5 +1,3 @@
-function 7zip_installed { cmd_available '7z' }
-
 function requires_7zip($manifest, $architecture) {
     foreach($dlurl in @(url $manifest $architecture)) {
         if(file_requires_7zip $dlurl) { return $true }