checkver: add 'jsonpath' alias for 'jp'

Ash258 · Sep 18, 2018 · 76fdb6b · 76fdb6b
1 parent 468649c
commit 76fdb6b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/bin/checkver.ps1 b/bin/checkver.ps1
@@ -86,6 +86,9 @@ $queue | ForEach-Object {
     if($json.checkver.jp) {
         $jsonpath = $json.checkver.jp
     }
+    if($json.checkver.jsonpath) {
+        $jsonpath = $json.checkver.jsonpath
+    }
 
     if ($json.checkver.replace -and $json.checkver.replace.GetType() -eq [System.String]) {
         $replace = $json.checkver.replace

diff --git a/lib/autoupdate.ps1 b/lib/autoupdate.ps1
@@ -159,7 +159,13 @@ function get_hash_for_app([String] $app, $config, [String] $version, [String] $u
         $hashmode = 'extract'
     }
 
-    if ($config.jp.Length -gt 0) {
+    $jsonpath = ''
+    if ($config.jp) {
+        $jsonpath = $config.jp
+        $hashmode = 'json'
+    }
+    if ($config.jsonpath) {
+        $jsonpath = $config.jsonpath
         $hashmode = 'json'
     }
 
@@ -175,7 +181,7 @@ function get_hash_for_app([String] $app, $config, [String] $version, [String] $u
             $hash = find_hash_in_textfile $hashfile_url $basename $config.find
         }
         'json' {
-            $hash = find_hash_in_json $hashfile_url $basename $config.jp
+            $hash = find_hash_in_json $hashfile_url $basename $jsonpath
         }
         'rdf' {
             $hash = find_hash_in_rdf $hashfile_url $basename

diff --git a/schema.json b/schema.json
@@ -30,6 +30,11 @@
                     "type": "string"
                 },
                 "jp": {
+                    "pattern": "^\\$\\..*$",
+                    "type": "string",
+                    "description": "Same as 'jsonpath'"
+                },
+                "jsonpath": {
                     "pattern": "^\\$\\..*$",
                     "type": "string"
                 },
@@ -216,6 +221,11 @@
                             "type": "string"
                         },
                         "jp": {
+                            "pattern": "^\\$\\..*$",
+                            "type": "string",
+                            "description": "Same as 'jsonpath'"
+                        },
+                        "jsonpath": {
                             "pattern": "^\\$\\..*$",
                             "type": "string"
                         },