Fix jsonpath

- The powershell json parsing gives us a PSCustomObject, where as @{} is a HashTable
- Adapted the jsonpath to always be a HashTable

Author: Deide

bin/checkver.ps1

@@ -136,7 +136,7 @@ $Queue | ForEach-Object {
         $regex = ''
     }
 
-    $jsonpath = ''
+    $jsonpath = @{}
     $xpath = ''
     $replace = ''
     $useGithubAPI = $false
@@ -196,12 +196,16 @@ $Queue | ForEach-Object {
         $regex = "CDATA\[/$path/.*?$sourceforgeRegex.*?\]".Replace('//', '/')
     }
 
+    $jp_ = ''
+
     if ($json.checkver.jp) {
-        $jsonpath = $json.checkver.jp
+        $jp_ = $json.checkver.jp
     }
+
     if ($json.checkver.jsonpath) {
-        $jsonpath = $json.checkver.jsonpath
+        $jp_ = $json.checkver.jsonpath
     }
+
     if ($json.checkver.xpath) {
         $xpath = $json.checkver.xpath
     }
@@ -212,13 +216,15 @@ $Queue | ForEach-Object {
     }
 
     # If the jsonpath is a string that's not empty, make it a hashtable with a `version` field.
-    if ($jsonpath.GetType() -eq [System.String] -and ![String]::IsNullOrEmpty($jsonpath)) {
-        $jsonpath = @{
-            version = $jsonpath
+    if (($jp_.GetType() -eq [System.String]) -and ![String]::IsNullOrEmpty($jp_)) {
+        $jsonpath.Add('version', $jp_)
+    } elseif (![String]::IsNullOrEmpty($jp_)) {
+        $json.checkver.jsonpath.psobject.properties | ForEach-Object {
+            $jsonpath.Add($_.Name, $_.Value)
         }
     }
 
-    if (!$jsonpath -and !$regex -and !$xpath) {
+    if (!$jsonpath.Count -and !$regex -and !$xpath) {
         $regex = $json.checkver
     }
 
@@ -281,7 +287,6 @@ while ($in_progress -gt 0) {
     $replace = $state.replace
     $expected_ver = $json.version
     $ver = $Version
-    $source = $url
     $matchesHashtable = @{}
 
     if (!$ver) {
@@ -295,10 +300,7 @@ while ($in_progress -gt 0) {
             continue
         }
 
-        if ($script) {
-            $page = Invoke-Command ([scriptblock]::Create($script -join "`r`n"))
-            $source = 'the output of script'
-        } elseif ($url) {
+        if ($url) {
             $ms = New-Object System.IO.MemoryStream
             $ms.Write($result, 0, $result.Length)
             $ms.Seek(0, 0) | Out-Null
@@ -307,8 +309,13 @@ while ($in_progress -gt 0) {
             }
             $page = (New-Object System.IO.StreamReader($ms, (Get-Encoding $wc))).ReadToEnd()
         }
+        $source = $url
+        if ($script) {
+            $page = Invoke-Command ([scriptblock]::Create($script -join "`r`n"))
+            $source = 'the output of script'
+        }
 
-        if ($jsonpath) {
+        if ($jsonpath.Count) {
             # Return only a single value if regex is absent
             # $noregex = [String]::IsNullOrEmpty($regexp)
             # If reverse is ON and regex is ON,
@@ -361,7 +368,7 @@ while ($in_progress -gt 0) {
             }
         }
 
-        if ($jsonpath -and $regexp) {
+        if ($jsonpath.Count -and $regexp) {
             $page = $ver
             $ver = ''
         }