knife-windows 0.8.4.rc.1 → 0.8.4.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e17f77cb8b3a227b11b4af7bd3169ca52e888422
-  data.tar.gz: 0b5513f0f7541b1d1c0306acf770cd59093b141c
+  metadata.gz: 312e69c1a7545c48db33da4833dc277bfebbdd65
+  data.tar.gz: 22c3c072c251f3448e386a18fdc61ca79d4e6657
 SHA512:
-  metadata.gz: 68789276f57eac9269c4f04ba252c76130766f09da5d76e7d14c15ed14a78e0e09e24121e9949d642067efadd9e1235e18355ad2c30d00eb7c757cd10cc1f2a0
-  data.tar.gz: 7da5d52384a19d703c069495ec6f612917fa739def17b057424db73d5695ac63da375937d3f5cf18d8e4c0d1c99732e0608d7a883ec45653674baabc29d90e1d
+  metadata.gz: d954be96b22329b9fd4fde3fe771d54356a1d9f72cee838f9d0a6645c327665a3fc82917abe7cd2a4f17abcd2d9c630ccf299fdf5540450a538390506ff42628
+  data.tar.gz: eac28d271deb924f600d06314a324187532870c403d2da96153f3fe5bd23666c6fe0ebff0fb14c36fda9fb682ee05668ee7e0e4628d9f3fb4f45e169a34d342a

data/lib/chef/knife/bootstrap/windows-chef-client-msi.erb

@@ -199,7 +199,7 @@ echo Validation key written.
 <% end -%>
 
 <% unless trusted_certs.empty? -%>
-mkdir -p C:/chef/trusted_certs
+mkdir <%= bootstrap_directory %>\trusted_certs
 <%= trusted_certs %>
 <% end -%>
 

data/lib/chef/knife/core/windows_bootstrap_context.rb

@@ -247,9 +247,9 @@ WGET_PS
         def trusted_certs_content
           content = ""
           if @chef_config[:trusted_certs_dir]
-            Dir.glob(File.join(Chef::Util::PathHelper.escape_glob(@chef_config[:trusted_certs_dir]), "*.{crt,pem}")).each do |cert|
-              content << "cat > /C:/chef/trusted_certs/#{File.basename(cert)} <<'EOP'\n" +
-                         IO.read(File.expand_path(cert)) + "\nEOP\n"
+            Dir.glob(File.join(PathHelper.escape_glob(@chef_config[:trusted_certs_dir]), "*.{crt,pem}")).each do |cert|
+              content << "> #{bootstrap_directory}/trusted_certs/#{File.basename(cert)} (\n" +
+                         escape_and_echo(IO.read(File.expand_path(cert))) + "\n)\n"
             end
           end
           content

data/lib/knife-windows/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Windows
-    VERSION = "0.8.4.rc.1"
+    VERSION = "0.8.4.rc.2"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-windows
 version: !ruby/object:Gem::Version
-  version: 0.8.4.rc.1
+  version: 0.8.4.rc.2
 platform: ruby
 authors:
 - Seth Chisamore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm-s