Code review comments: windows install

chef · Mar 26, 2018 · 7005938 · 7005938
1 parent dd3f44d
commit 7005938
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/omnibus/config/projects/chef-workstation.rb b/omnibus/config/projects/chef-workstation.rb
@@ -41,8 +41,8 @@
 
 dependency "preparation"
 dependency "chef-workstation"
-dependency "clean-static-libs"
 dependency "version-manifest"
+dependency "clean-static-libs"
 
 exclude "**/.git"
 exclude "**/bundler/git"

diff --git a/omnibus/config/software/chef-workstation.rb b/omnibus/config/software/chef-workstation.rb
@@ -35,7 +35,6 @@
 dependency "bundler"
 dependency "ruby"
 dependency "appbundler"
-dependency "version-manifest"
 
 relative_path "components/chef-workstation"
 

diff --git a/omnibus/resources/chef-workstation/msi/source.wxs.erb b/omnibus/resources/chef-workstation/msi/source.wxs.erb
@@ -22,7 +22,7 @@
     -->
     <% if fastmsi %>
     <SetProperty Id="FastUnzip"
-                 Value="FASTZIPDIR=[INSTALLLOCATION];FASTZIPAPPNAME=chef_workstation"
+                 Value="FASTZIPDIR=[INSTALLLOCATION];FASTZIPAPPNAME=chef-workstation"
                  Sequence="execute"
                  Before="FastUnzip" />
 
@@ -38,7 +38,7 @@
 
     <CustomAction Id="Cleanup"
                   Directory="INSTALLLOCATION"
-                  ExeCommand="cmd /C &quot;rd /S /Q chef_workstation&quot;"
+                  ExeCommand="cmd /C &quot;rd /S /Q chef-workstation&quot;"
                   Execute="deferred"
                   Impersonate="no"
                   Return="ignore" />