builds(checkver): Exit routine earlier if error (#5025)

ScoopInstaller · Jul 1, 2022 · 794f8a5 · 794f8a5
1 parent 53f0e9a
commit 794f8a5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@
 ### Builds
 
 - **checkver,auto-pr:** Allow passing file path ([#5019](https://github.com/ScoopInstaller/Scoop/issues/5019))
+- **checkver:** Exit routine earlier if error ([#5025](https://github.com/ScoopInstaller/Scoop/issues/5025))
 
 ### Tests
 

diff --git a/bin/checkver.ps1 b/bin/checkver.ps1
@@ -224,20 +224,20 @@ while ($in_progress -gt 0) {
     $ver = $Version
 
     if (!$ver) {
-        $page = (Get-Encoding($wc)).GetString($ev.SourceEventArgs.Result)
-        $err = $ev.SourceEventArgs.Error
-        if ($json.checkver.script) {
-            $page = Invoke-Command ([scriptblock]::Create($json.checkver.script -join "`r`n"))
+        if (!$regex -and $replace) {
+            next "'replace' requires 're' or 'regex'"
+            continue
         }
-
+        $err = $ev.SourceEventArgs.Error
         if ($err) {
             next "$($err.message)`r`nURL $url is not valid"
             continue
         }
 
-        if (!$regex -and $replace) {
-            next "'replace' requires 're' or 'regex'"
-            continue
+        if ($json.checkver.script) {
+            $page = Invoke-Command ([scriptblock]::Create($json.checkver.script -join "`r`n"))
+        } else {
+            $page = (Get-Encoding($wc)).GetString($ev.SourceEventArgs.Result)
         }
 
         if ($jsonpath) {