Improve is_scoop_outdated() and add last_scoop_update()

ScoopInstaller · Mar 21, 2018 · f3f559c · f3f559c
1 parent 7cc6e96
commit f3f559c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/lib/core.ps1 b/lib/core.ps1
@@ -490,16 +490,24 @@ function get_app_with_version([String] $app) {
         "version" = if ($version) { $version } else { 'latest' }
     }
 }
+
+function last_scoop_update() {
+    $last_update = (scoop config lastupdate)
+    if(!$last_update) {
+        $last_update = [System.DateTime]::Now
+    }
+    return $last_update.ToLocalTime()
+}
+
 function is_scoop_outdated() {
-    $now = Get-Date
-    try {
-        $last_update = (Get-Date $(scoop config lastupdate)).ToLocalTime().AddHours(3)
-    } catch {
+    $last_update = $(last_scoop_update)
+    $now = [System.DateTime]::Now
+    if($last_update -eq $now) {
         scoop config lastupdate $now
-        # remove 1 minute to force an update for the first time
-        $last_update = $now.AddMinutes(-1)
+        # enforce an update for the first time
+        return $true
     }
-    return $last_update -lt  $now.ToLocalTime()
+    return $last_update.AddHours(3) -lt  [System.DateTime]::Now.ToLocalTime()
 }
 
 function substitute($entity, [Hashtable] $params) {

diff --git a/libexec/scoop-update.ps1 b/libexec/scoop-update.ps1
@@ -53,7 +53,7 @@ function update_scoop() {
     if(!$git) { abort "Scoop uses Git to update itself. Run 'scoop install git' and try again." }
 
     write-host "Updating Scoop..."
-    $last_update = (Get-Date (Get-Date $(scoop config lastupdate)).ToLocalTime() -Format s)
+    $last_update = $(last_scoop_update).ToString('s')
     $currentdir = fullpath $(versiondir 'scoop' 'current')
     if(!(test-path "$currentdir\.git")) {
         $newdir = fullpath $(versiondir 'scoop' 'new')