Refactor aria2_path() to file_path()

ScoopInstaller · Aug 8, 2018 · 0f46401 · 0f46401
1 parent b8d9d9c
commit 0f46401
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/lib/core.ps1 b/lib/core.ps1
@@ -96,23 +96,27 @@ function installed_apps($global) {
     }
 }
 
-function aria2_path() {
-    # normal path to executable
-    $aria2 = "$(versiondir 'aria2' 'current' $false)\aria2c.exe"
-    if(Test-Path($aria2)) {
-        return $aria2
+function file_path($app, $file) {
+    # normal path to file
+    $path = "$(versiondir $app 'current' $false)\$file"
+    if(Test-Path($path)) {
+        return $path
     }
 
-    # global path to executable
-    $aria2 = "$(versiondir 'aria2' 'current' $true)\aria2c.exe"
-    if(Test-Path($aria2)) {
-        return $aria2
+    # global path to file
+    $path = "$(versiondir $app 'current' $true)\$file"
+    if(Test-Path($path)) {
+        return $path
     }
 
     # not found
     return $null
 }
 
+function aria2_path() {
+    return (file_path 'aria2' 'aria2c.exe')
+}
+
 function aria2_installed() {
     return ![String]::IsNullOrWhiteSpace("$(aria2_path)")
 }