Merge pull request #892 from Thilas/libreoffice-streams-change

[WIP] Change libreoffice package to use alphabetical streams
chocolatey-community · Nov 9, 2017 · 0b02771 · 0b02771
2 parents cb00d46 + d6acd20
commit 0b02771
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/automatic/libreoffice/libreoffice.json b/automatic/libreoffice/libreoffice.json
@@ -1,4 +1,4 @@
 {
-    "5.3":  "5.3.7",
-    "5.4":  "5.4.3"
+    "still":  "5.3.7",
+    "fresh":  "5.4.3"
 }
diff --git a/automatic/libreoffice/update.ps1 b/automatic/libreoffice/update.ps1
@@ -54,11 +54,10 @@ function GetStillVersions() {
 }
 
 function global:au_GetLatest {
-  $streams = @{ }
-  $fresh = GetFreshVersion
-  $still = GetStillVersions
-  $streams.Add((Get-Version $fresh.Version).ToString(2), $fresh)
-  $streams.Add((Get-Version $still.Version).ToString(2), $still)
+  $streams = [ordered] @{
+    fresh = GetFreshVersion
+    still = GetStillVersions
+  }
 
   return @{ Streams = $streams }
 }

diff --git a/automatic/nodejs.install/nodejs.install.json b/automatic/nodejs.install/nodejs.install.json
@@ -1,7 +1,7 @@
 {
     "4.8":  "4.8.6",
     "6.11":  "6.11.5",
-    "8.9":  "8.9.0",
+    "8.9":  "8.9.1",
     "9.0":  "9.0.0",
     "6.12":  "6.12.0",
     "9.1":  "9.1.0"

diff --git a/automatic/nodejs.install/update.ps1 b/automatic/nodejs.install/update.ps1
@@ -1,5 +1,5 @@
 [CmdletBinding()]
-param($Include, [switch] $Force)
+param($IncludeStream, [switch] $Force)
 
 import-module au
 
@@ -59,5 +59,5 @@ function global:au_GetLatest {
 }
 
 if ($MyInvocation.InvocationName -ne '.') { # run the update only if script is not sourced
-  update -ChecksumFor none -Include $Include -Force:$Force
+  update -ChecksumFor none -IncludeStream $IncludeStream -Force:$Force
 }
diff --git a/automatic/nodejs/nodejs.json b/automatic/nodejs/nodejs.json
@@ -1,7 +1,7 @@
 {
     "4.8":  "4.8.6",
     "6.11":  "6.11.5",
-    "8.9":  "8.9.0",
+    "8.9":  "8.9.1",
     "9.0":  "9.0.0",
     "6.12":  "6.12.0",
     "9.1":  "9.1.0"

diff --git a/automatic/nodejs/update.ps1 b/automatic/nodejs/update.ps1
@@ -1,5 +1,5 @@
 [CmdletBinding()]
-param($Include, [switch] $Force)
+param($IncludeStream, [switch] $Force)
 
 . $PSScriptRoot\..\nodejs.install\update.ps1
 
@@ -11,4 +11,4 @@ function global:au_SearchReplace {
   }
 }
 
-update -ChecksumFor none -Include $Include -Force:$Force
+update -ChecksumFor none -IncludeStream $IncludeStream -Force:$Force
diff --git a/automatic/virtualbox/virtualbox.json b/automatic/virtualbox/virtualbox.json
@@ -4,5 +4,6 @@
     "5.2":  "5.2.0",
     "4.0":  "4.0.36",
     "4.1":  "4.1.44",
-    "4.2":  "4.2.36"
+    "4.2":  "4.2.36",
+    "4.3":  "4.3.40"
 }
diff --git a/update_all.ps1 b/update_all.ps1
@@ -98,7 +98,7 @@ $Options = [ordered]@{
         if (!$p) { return }
 
         $global:au_Force   = $true
-        $global:au_Include = $Matches['stream']
+        $global:au_IncludeStream = $Matches['stream']
         $global:au_Version = $Matches['version']
     }
 }