mixlib-install 1.0.11 → 1.0.12
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +5 -0
- data/lib/mixlib/install/generator/bourne/scripts/platform_detection.sh +13 -0
- data/lib/mixlib/install/generator/powershell/scripts/get_project_metadata.ps1.erb +0 -5
- data/lib/mixlib/install/generator/powershell/scripts/get_project_metadata_for_artifactory.ps1.erb +0 -5
- data/lib/mixlib/install/generator/powershell/scripts/install_project.ps1 +0 -5
- data/lib/mixlib/install/version.rb +1 -1
- data/support/install_command.ps1 +14 -5
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 0472a91eb0523c4a4d71757705485fcc536da342
|
|
4
|
+
data.tar.gz: a93463411cf239b06f9c2cd87cc1bc9a4ff9c98a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e2fc4c89038e426cc11f7458f0f508f686ce6e6c55303218ea9435f27b51885cc4e7b8f87c602c331a3d8a980debb51350108fb7b787ba1b19891329639fd2b8
|
|
7
|
+
data.tar.gz: b148002234e2123801d8bd14b878977f49291aed34b557e3a880cab48f2818229dcebfb87ab6839f3fea5fe2e1b31d9e8e47456b7b9e34105906491b2f33fe9f
|
data/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
# Change Log
|
|
2
2
|
|
|
3
|
+
## [1.0.12]
|
|
4
|
+
- Normalize the architecture detection to return either x86_64, i386 or sparc.
|
|
5
|
+
- Remove the powershell product_name validation to support delivery-cli and push-jobs-client in install.ps1.
|
|
6
|
+
- Retry MSI installation when it fails with 1618 (another installation in progress).
|
|
7
|
+
|
|
3
8
|
## [1.0.11]
|
|
4
9
|
- Add `platform_version_compatibility_mode` option which makes mixlib-install select an artifact built for an earlier version of a platform when set.
|
|
5
10
|
|
|
@@ -150,6 +150,19 @@ case $platform in
|
|
|
150
150
|
;;
|
|
151
151
|
esac
|
|
152
152
|
|
|
153
|
+
# normalize the architecture we detected
|
|
154
|
+
case $machine in
|
|
155
|
+
"x86_64"|"amd64"|"x64")
|
|
156
|
+
machine="x86_64"
|
|
157
|
+
;;
|
|
158
|
+
"i386"|"i86pc"|"x86"|"i686")
|
|
159
|
+
machine="i386"
|
|
160
|
+
;;
|
|
161
|
+
"sparc"|"sun4u"|"sun4v")
|
|
162
|
+
machine="sparc"
|
|
163
|
+
;;
|
|
164
|
+
esac
|
|
165
|
+
|
|
153
166
|
if test "x$platform_version" = "x"; then
|
|
154
167
|
echo "Unable to determine platform version!"
|
|
155
168
|
report_bug
|
|
@@ -19,11 +19,6 @@ function Get-ProjectMetadata {
|
|
|
19
19
|
[uri]$base_server_uri = '<%= base_url %>',
|
|
20
20
|
[string]
|
|
21
21
|
# Project to install
|
|
22
|
-
# chef - Chef Client
|
|
23
|
-
# chefdk - Chef Development Kit
|
|
24
|
-
# angrychef - AngryChef
|
|
25
|
-
# server and container are not valid windows targets
|
|
26
|
-
[validateset('chef', 'chefdk', 'angrychef')]
|
|
27
22
|
[string]
|
|
28
23
|
$project = 'chef',
|
|
29
24
|
# Version of the application to install
|
data/lib/mixlib/install/generator/powershell/scripts/get_project_metadata_for_artifactory.ps1.erb
CHANGED
|
@@ -19,11 +19,6 @@ function Get-ProjectMetadata {
|
|
|
19
19
|
[uri]$base_server_uri = '<%= base_url %>',
|
|
20
20
|
[string]
|
|
21
21
|
# Project to install
|
|
22
|
-
# chef - Chef Client
|
|
23
|
-
# chefdk - Chef Development Kit
|
|
24
|
-
# angrychef - AngryChef
|
|
25
|
-
# server and container are not valid windows targets
|
|
26
|
-
[validateset('chef', 'chefdk', 'angrychef')]
|
|
27
22
|
[string]
|
|
28
23
|
$project = 'chef',
|
|
29
24
|
# Version of the application to install
|
|
@@ -16,11 +16,6 @@ function Install-Project {
|
|
|
16
16
|
[cmdletbinding(SupportsShouldProcess=$true)]
|
|
17
17
|
param (
|
|
18
18
|
# Project to install
|
|
19
|
-
# chef - Chef Client
|
|
20
|
-
# chefdk - Chef Development Kit
|
|
21
|
-
# angrychef - AngryChef
|
|
22
|
-
# server and container are not valid windows targets
|
|
23
|
-
[validateset('chef', 'chefdk', 'angrychef')]
|
|
24
19
|
[string]
|
|
25
20
|
$project = 'chef',
|
|
26
21
|
# Release channel to install from
|
data/support/install_command.ps1
CHANGED
|
@@ -43,11 +43,20 @@ Function Download-Chef($url, $sha256, $dst) {
|
|
|
43
43
|
|
|
44
44
|
Function Install-Chef($msi) {
|
|
45
45
|
Log "Installing Chef Omnibus package $msi"
|
|
46
|
-
$
|
|
47
|
-
$
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
46
|
+
$installingChef = $True
|
|
47
|
+
$installAttempts = 0
|
|
48
|
+
while ($installingChef) {
|
|
49
|
+
$installAttempts++
|
|
50
|
+
$p = Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /i $msi" -Passthru -Wait
|
|
51
|
+
$p.WaitForExit()
|
|
52
|
+
if ($p.ExitCode -eq 1618) {
|
|
53
|
+
Log "Another msi install is in progress (exit code 1618), retrying ($($installAttempts))..."
|
|
54
|
+
continue
|
|
55
|
+
} elseif ($p.ExitCode -ne 0) {
|
|
56
|
+
throw "msiexec was not successful. Received exit code $($p.ExitCode)"
|
|
57
|
+
}
|
|
58
|
+
$installingChef = $False
|
|
59
|
+
}
|
|
51
60
|
Remove-Item $msi -Force
|
|
52
61
|
Log "Installation complete"
|
|
53
62
|
}
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: mixlib-install
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.
|
|
4
|
+
version: 1.0.12
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Thom May
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2016-
|
|
12
|
+
date: 2016-05-25 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: artifactory
|
|
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
222
222
|
version: '0'
|
|
223
223
|
requirements: []
|
|
224
224
|
rubyforge_project:
|
|
225
|
-
rubygems_version: 2.6.
|
|
225
|
+
rubygems_version: 2.6.4
|
|
226
226
|
signing_key:
|
|
227
227
|
specification_version: 4
|
|
228
228
|
summary: A mixin to help with omnitruck installs
|