Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change libreoffice package to use alphabetical streams #892

Merged
merged 3 commits into from
Nov 9, 2017
Merged

Change libreoffice package to use alphabetical streams #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f812b2
Change libreoffice package to use alphabetical streams
Nov 6, 2017
47d9482
Rename Include to IncludeStream
Nov 9, 2017
d6acd20
Fix existing versions of streams
Nov 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions automatic/libreoffice/libreoffice.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"5.3": "5.3.7",
"5.4": "5.4.3"
"still": "5.3.7",
"fresh": "5.4.3"
}
9 changes: 4 additions & 5 deletions automatic/libreoffice/update.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
Expand Down
2 changes: 1 addition & 1 deletion automatic/nodejs.install/nodejs.install.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions automatic/nodejs.install/update.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[CmdletBinding()]
param($Include, [switch] $Force)
param($IncludeStream, [switch] $Force)

import-module au

Expand Down Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion automatic/nodejs/nodejs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions automatic/nodejs/update.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[CmdletBinding()]
param($Include, [switch] $Force)
param($IncludeStream, [switch] $Force)

. $PSScriptRoot\..\nodejs.install\update.ps1

Expand All @@ -11,4 +11,4 @@ function global:au_SearchReplace {
}
}

update -ChecksumFor none -Include $Include -Force:$Force
update -ChecksumFor none -IncludeStream $IncludeStream -Force:$Force
3 changes: 2 additions & 1 deletion automatic/virtualbox/virtualbox.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion update_all.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
}
}
Expand Down