feat(checkver): Ignore disable property when -Force is specified

Ash258 · Mar 12, 2021 · 4fb735c · 4fb735c
1 parent e640392
commit 4fb735c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - **format**: Extract checkver fixes into own function and add generic adjust property function
 - **schema**
     - Add `disable` property to `checkver` and `autoupdate`
+        - `-Force` will ignore this property
     - Remove deprecated short properties
     - Cleanup descriptions
 - Remove deprecated functions from code-base

diff --git a/bin/checkver.ps1 b/bin/checkver.ps1
@@ -197,14 +197,14 @@ function Invoke-Check {
     }
 
     # Forcing an update implies updating
-    if ($ForceUpdate) { $Update = $true }
+    if ($ForceUpdate) {
+        $Update = $true
+    } elseif ($Update -and ($json.autoupdate.disable -and ($json.autoupdate.disable -eq $true))) {
+        Write-UserMessage "${appName}: Skipping disabled autoupdate" -Info
+        return
+    }
 
     if ($Update -and $json.autoupdate) {
-        if ($json.autoupdate.disable -and ($json.autoupdate.disable -eq $true)) {
-            Write-UserMessage "${appName}: Skipping disabled autoupdate" -Info
-            return
-        }
-
         if ($ForceUpdate) { Write-UserMessage -Message 'Forcing autoupdate!' -Color 'DarkMagenta' }
         if ($Version -ne '') { $ver = $Version }
 
@@ -238,7 +238,7 @@ foreach ($ff in Get-ChildItem $Dir "$Search.*" -File) {
         continue
     }
     if ($m.checkver) {
-        if ($m.checkver.disable -and ($m.checkver.disable -eq $true)) {
+        if (!$ForceUpdate -and ($m.checkver.disable -and ($m.checkver.disable -eq $true))) {
             Write-UserMessage "$($ff.BaseName): Skipping disabled checkver" -Info
             continue
         }

diff --git a/schema.json b/schema.json
@@ -316,7 +316,7 @@
                             "$ref": "#/definitions/stringOrArrayOfStrings"
                         },
                         "disable": {
-                            "description": "Specifies to not execute checkver script without deleting whole property.",
+                            "description": "Specifies to not execute checkver script without deleting whole property. Forcing checkver will ignore this setting.",
                             "type": "boolean"
                         }
                     }
@@ -437,7 +437,7 @@
                     "type": "string"
                 },
                 "disable": {
-                    "description": "Specifies to prevent autoupdating of manifest without deleting whole property.",
+                    "description": "Specifies to prevent autoupdating of manifest without deleting whole property. Forcing checkver will ignore this setting.",
                     "type": "boolean"
                 }
             }