search ~ better handling for invalid query (fixes ScoopInstaller#634)

rivy · Jan 17, 2016 · dbb1f15 · dbb1f15
1 parent 40c80e5
commit dbb1f15
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/libexec/scoop-search.ps1 b/libexec/scoop-search.ps1
@@ -29,13 +29,20 @@ function search_bucket($bucket, $query) {
         @{ name = $_ }
     }
 
-    if($query) { $apps = $apps | where-object {
-        if($_.name -match $query) { return $true }
-        $bin = bin_match (manifest $_.name $bucket) $query
-        if($bin) {
-            $_.bin = $bin; return $true;
+    if($query) {
+        try {
+            $query = new-object regex $query
+        } catch {
+            abort "invalid regular expression: $($_.exception.innerexception.message)"
         }
-    } }
+        $apps = $apps | where-object {
+            if($_.name -match $query) { return $true }
+            $bin = bin_match (manifest $_.name $bucket) $query
+            if($bin) {
+                $_.bin = $bin; return $true;
+            }
+        }
+    }
     $apps | foreach-object { $_.version = (latest_version $_.name $bucket); $_ }
 }