parse_app(): fix for relative paths

ScoopInstaller · May 7, 2018 · ff9c0c3 · ff9c0c3
1 parent d0fa26e
commit ff9c0c3
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/lib/core.ps1 b/lib/core.ps1
@@ -494,15 +494,11 @@ function applist($apps, $global) {
     return ,@($apps | ForEach-Object { ,@($_, $global) })
 }
 
-function parse_app($app) {
-    $app = [string]$app
-    if($app -notmatch '^((ht)|f)tps?://' -and $app -notmatch '^(?:[\w]\:\\|\\\\)') {
-        if($app -match '(?:(?<bucket>[a-zA-Z0-9-]+)\/)?(?<app>[a-zA-Z0-9-.]+)(?:@(?<version>.*))?') {
-            return $matches['app'], $matches['bucket'], $matches['version']
-        }
+function parse_app([string] $app) {
+    if($app -match '(?:(?<bucket>[a-zA-Z0-9-]+)\/)?(?<app>.*.json$|[a-zA-Z0-9-.]+)(?:@(?<version>.*))?') {
+        return $matches['app'], $matches['bucket'], $matches['version']
     }
-
-    $app, $null, $null
+    return $app, $null, $null
 }
 
 function last_scoop_update() {

diff --git a/test/Scoop-Core.Tests.ps1 b/test/Scoop-Core.Tests.ps1
@@ -223,6 +223,30 @@ describe 'app' {
         $bucket | should be $null
         $version | should be $null
 
+        $query = "test.json"
+        $app, $bucket, $version = parse_app $query
+        $app | should be "test.json"
+        $bucket | should be $null
+        $version | should be $null
+
+        $query = ".\test.json"
+        $app, $bucket, $version = parse_app $query
+        $app | should be ".\test.json"
+        $bucket | should be $null
+        $version | should be $null
+
+        $query = "..\test.json"
+        $app, $bucket, $version = parse_app $query
+        $app | should be "..\test.json"
+        $bucket | should be $null
+        $version | should be $null
+
+        $query = "\\share\test.json"
+        $app, $bucket, $version = parse_app $query
+        $app | should be "\\share\test.json"
+        $bucket | should be $null
+        $version | should be $null
+
         $query = "https://example.com/test.json"
         $app, $bucket, $version = parse_app $query
         $app | should be "https://example.com/test.json"