autoupdate: add 'regex' alias for 'find'

ScoopInstaller · Sep 18, 2018 · 3453487 · 3453487
1 parent 76fdb6b
commit 3453487
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/autoupdate.ps1 b/lib/autoupdate.ps1
@@ -168,6 +168,13 @@ function get_hash_for_app([String] $app, $config, [String] $version, [String] $u
         $jsonpath = $config.jsonpath
         $hashmode = 'json'
     }
+    $regex = ''
+    if ($config.find) {
+        $regex = $config.find
+    }
+    if ($config.regex) {
+        $regex = $config.regex
+    }
 
     if (!$hashfile_url -and $url -match "(?:downloads\.)?sourceforge.net\/projects?\/(?<project>[^\/]+)\/(?:files\/)?(?<file>.*)") {
         $hashmode = 'sourceforge'
@@ -178,7 +185,7 @@ function get_hash_for_app([String] $app, $config, [String] $version, [String] $u
 
     switch ($hashmode) {
         'extract' {
-            $hash = find_hash_in_textfile $hashfile_url $basename $config.find
+            $hash = find_hash_in_textfile $hashfile_url $basename $regex
         }
         'json' {
             $hash = find_hash_in_json $hashfile_url $basename $jsonpath

diff --git a/schema.json b/schema.json
@@ -26,6 +26,11 @@
             "additionalProperties": false,
             "properties": {
                 "find": {
+                    "format": "regex",
+                    "type": "string",
+                    "description": "Same as 'regex'"
+                },
+                "regex": {
                     "format": "regex",
                     "type": "string"
                 },