mixlib-install 1.2.0 → 1.2.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: af96827b91f93939e6376192d760548132394e7e
4
- data.tar.gz: 39e849c94aebecb08b7f0f5e4328aeb8a45cb038
3
+ metadata.gz: 2d18d8c1c90dce1d5b13dc0a8a07100e3edd6d00
4
+ data.tar.gz: 35c920addbde19c96293902799a43740f5211444
5
5
  SHA512:
6
- metadata.gz: 0cb34501343fb8891d181076ef8c213d034cdcbad866fc758754fdf24830883660bbca4c77282b0006118d48f1c22748a74ec6aba3935482349ed0fe446ed8af
7
- data.tar.gz: 7320f109233968d75a508f959fc3a5c71964c40eb7921563dd21a5c1cf353ed5a2a8103e04b2770755d1e05981c356f7504a5948c4eb9229453250cffceb656c
6
+ metadata.gz: c1dca339b332b64c7bd0dab7a00a256309c0020d0271cb511cb77fc33afa104a18f63c6dc5418f5fa5bae70f0fb2eb27df3d7956cb6e064fafcacf1e2834fd1b
7
+ data.tar.gz: 849619cd75412e711e3ecba1d7b107ab5d730fd06280fdca4671807ec91a8b0c5247ef3e9974369ba2529b791d338bca4f88e168d653d4980c3dbdc006b995b5
@@ -0,0 +1,3 @@
1
+ # Managing line ending conversions
2
+ # See http://git-scm.com/docs/gitattributes#_end-of-line_conversion
3
+ * text eol=lf
@@ -1,5 +1,11 @@
1
1
  # Change Log
2
2
 
3
+ ## [1.2.2]
4
+ - Add a .gitattributes file to ensure files are checked out with lf line endings
5
+
6
+ ## [1.2.1]
7
+ - Fix nano appx installs replacing the symlink with a full copy
8
+
3
9
  ## [1.2.0]
4
10
  - Fix omnibus project mappings
5
11
  - Add `available_versions` method to API
@@ -118,21 +118,22 @@ Function Install-ChefAppx($appx, $project) {
118
118
  Add-AppxPackage -Path $appx -ErrorAction Stop
119
119
  $package = (Get-AppxPackage -Name $project).InstallLocation
120
120
  $installRoot = "$env:SystemDrive/opscode"
121
- $link = Join-Path $installRoot $project
122
-
123
- # Remove link from a previous install
124
- # There is currently a bug in removing symbolic links from Powershell
125
- # so we use the fisher-price cmd shell to do it
126
- if(Test-Path $link) {
127
- cmd /c rmdir $link
128
- }
121
+ $omnibusRoot = Join-Path $installRoot $project
129
122
 
130
123
  if(!(Test-Path $installRoot)) {
131
124
  New-Item -ItemType Directory -Path $installRoot
132
125
  }
133
- push-Location $installRoot
134
- New-Item -ItemType SymbolicLink -Name $project -Target $package
135
- Pop-Location
126
+
127
+ # Remove old version of chef if it is here
128
+ if(Test-Path $omnibusRoot) {
129
+ Remove-Item -Path $omnibusRoot -Recurse -Force
130
+ }
131
+
132
+ # copy the appx install to the omnibus root. There are serious
133
+ # ACL related issues with running chef from the appx InstallLocation
134
+ # Hoping this is temporary and we can eventually just symlink
135
+ Copy-Item $package $omnibusRoot -Recurse
136
+
136
137
  return $true
137
138
  }
138
139
 
@@ -1,5 +1,5 @@
1
1
  module Mixlib
2
2
  class Install
3
- VERSION = "1.2.0"
3
+ VERSION = "1.2.2"
4
4
  end
5
5
  end
@@ -83,23 +83,21 @@ Function Install-ChefAppx($appx, $chef_omnibus_root) {
83
83
  Add-AppxPackage -Path $appx -ErrorAction Stop
84
84
 
85
85
  $rootParent = Split-Path $chef_omnibus_root -Parent
86
- $rootFolder = Split-Path $chef_omnibus_root -Leaf
87
- $link = Join-Path $rootParent $rootFolder
88
-
89
- # Remove link from a previous install
90
- # There is currently a bug in removing symbolic links from Powershell
91
- # so we use the fisher-price cmd shell to do it
92
- if(Test-Path $link) {
93
- cmd /c rmdir $link
94
- }
95
86
 
96
- $package = (Get-AppxPackage -Name chef).InstallLocation
97
87
  if(!(Test-Path $rootParent)) {
98
88
  New-Item -ItemType Directory -Path $rootParent
99
89
  }
100
- push-Location $rootParent
101
- New-Item -ItemType SymbolicLink -Name $rootFolder -Target $package
102
- Pop-Location
90
+
91
+ # Remove old version of chef if it is here
92
+ if(Test-Path $chef_omnibus_root) {
93
+ Remove-Item -Path $chef_omnibus_root -Recurse -Force
94
+ }
95
+
96
+ # copy the appx install to the omnibus_root. There are serious
97
+ # ACL related issues with running chef from the appx InstallLocation
98
+ # Hoping this is temporary and we can eventually just symlink
99
+ $package = (Get-AppxPackage -Name chef).InstallLocation
100
+ Copy-Item $package $chef_omnibus_root -Recurse
103
101
 
104
102
  return $true
105
103
  }
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.2.0
4
+ version: 1.2.2
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-09-15 00:00:00.000000000 Z
12
+ date: 2016-09-20 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: artifactory
@@ -173,6 +173,7 @@ executables: []
173
173
  extensions: []
174
174
  extra_rdoc_files: []
175
175
  files:
176
+ - ".gitattributes"
176
177
  - ".gitignore"
177
178
  - ".rspec"
178
179
  - ".travis.yml"
@@ -249,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
249
250
  version: '0'
250
251
  requirements: []
251
252
  rubyforge_project:
252
- rubygems_version: 2.6.6
253
+ rubygems_version: 2.6.4
253
254
  signing_key:
254
255
  specification_version: 4
255
256
  summary: A mixin to help with omnitruck installs