mixlib-install 2.1.8 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40fa6c0a0b63502b8c38218361ecff0c041ebbd7
-  data.tar.gz: e151caa4b979c2e561c5520d860bfc4e0f544e9a
+  metadata.gz: 85494cb7677e35f2fd1a84ec8c23ecfc0d24efef
+  data.tar.gz: 38048f01eafc6bd86d79cab807957e0e62a98ab9
 SHA512:
-  metadata.gz: 4441ee64cfed4d6cc63ccf209def59e4f3866393b389d9cbd70c3211a7332e1d4b664a1e21ed972b6062d3bf423ec16686c18efb92dee48803d8f3c05726efcb
-  data.tar.gz: 8f7c097bd4c36ab4474dec1007d82da49b02d015be101575348cca832ed503e6063b5123ed3536c78cc9ac9779234859dd8283678d88841a8bfc67926649c7a3
+  metadata.gz: 489c05e749dd5b421d34b0366872dc9006d1cea865ab8e01b35126808b112341723e9cbb87588ce8b7d85c963d179e148a4049db59b905872e9ed2eeb4934f73
+  data.tar.gz: 89c412f80a84c223af0f329674affd1325ea9e2f846bf58df0f944c7429613d591d08923648e48b653b018c04f091d2c42d8fff1ef40eab39b17abae31cfa706

data/CHANGELOG.md

@@ -1,8 +1,11 @@
 # Change Log
 
+## [2.1.9]
+- Add `download_directory` option to powershell install script
+
 ## [2.1.8]
 - Query performance optimizations
-- Add ChefClientFeature support to the MSI install script
+- Add ChefClientFeature support to the powershell install script
 
 ## [2.1.7]
 - Add support for passing arguments to the MSI in install scripts

data/lib/mixlib/install/script_generator.rb

@@ -130,9 +130,12 @@ module Mixlib
       # @return [String] shell variable lines
       # @api private
       def install_command_vars_for_powershell
+        d_flag = install_flags.nil? ? nil : install_flags.match(/-download_directory (\S+)/)
+        download_directory = d_flag.nil? ? "$env:TEMP" : d_flag[1]
         [
           shell_var("chef_omnibus_root", root),
-          shell_var("msi", "$env:TEMP\\chef-#{version}.msi"),
+          shell_var("msi", "#{download_directory}\\chef-#{version}.msi"),
+          shell_var("download_directory", download_directory),
         ].tap do |vars|
           if install_msi_url
             vars << shell_var("chef_msi_url", install_msi_url)

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "2.1.8"
+    VERSION = "2.1.9"
   end
 end

data/support/install_command.ps1

@@ -43,8 +43,14 @@ Function Download-Chef($url, $sha256, $dst) {
   Log "Download complete."
 
   if ($sha256 -eq $null) { Log "Skipping sha256 verification" }
-  elseif (($dsha256 = Get-SHA256 $dst) -eq $sha256) { Log "Successfully verified $dst" }
-  else { throw "SHA256 for $dst $dsha256 does not match $sha256" }
+  elseif (Verify-SHA256 $dst $sha256) { Log "Successfully verified $dst" }
+  else { throw "SHA256 for $dst does not match $sha256" }
+}
+
+Function Verify-SHA256($path, $sha256) {
+  if ($sha256 -eq $null) { return $false }
+  elseif (($dsha256 = Get-SHA256 $path) -eq $sha256) { return $true }
+  else { return $false }
 }
 
 Function Install-Chef($msi, $chef_omnibus_root) {
@@ -63,7 +69,6 @@ Function Install-Chef($msi, $chef_omnibus_root) {
     if(!$result) { continue }
     $installingChef = $False
   }
-  Remove-Item $msi -Force
   Log "Installation complete"
 }
 
@@ -185,9 +190,13 @@ if (Check-UpdateChef $chef_omnibus_root $version) {
     $url = $chef_msi_url
     $sha256 = $null
   }
-  $msi = Join-Path $env:temp "$url".Split("/")[-1]
+  $msi = Join-Path $download_directory "$url".Split("/")[-1]
   $msi = Unresolve-Path $msi
-  Download-Chef "$url" $sha256 $msi
+  if (Verify-SHA256 $msi $sha256) {
+    Log "Skipping package download; found a matching package at $msi"
+  } else {
+    Download-Chef "$url" $sha256 $msi
+  }
   Install-Chef $msi $chef_omnibus_root
 } else {
   Write-Host "-----> Chef Omnibus installation detected ($pretty_version)"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.1.9
 platform: ruby
 authors:
 - Thom May