Merge pull request #204 from OpenVoxProject/fix_windows

Fix windows builds

Author: nmburgan

openbolt.gemspec

@@ -53,7 +53,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "jwt", "~> 2.2"
   spec.add_dependency "logging", "~> 2.2"
   spec.add_dependency "minitar", ">= 0.6", "< 2.0"
-  spec.add_dependency "net-ftp", ">= 0.3", "< 0.4"
   spec.add_dependency "net-scp", ">= 1.2", "< 5.0"
   spec.add_dependency "net-ssh", ">= 4.0", "< 8.0"
   spec.add_dependency "net-ssh-krb", "~> 0.5"
@@ -63,13 +62,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "puppet-resource_api", ">= 1.8.1"
   spec.add_dependency "r10k", ">= 3.10", "< 6"
   spec.add_dependency "ruby_smb", "~> 1.0"
-  spec.add_dependency "syslog", "~> 0.1"
   spec.add_dependency "terminal-table", "~> 4.0"
   spec.add_dependency "winrm", "~> 2.0"
   spec.add_dependency "winrm-fs", "~> 1.3"
-  if Gem.win_platform?
-    spec.add_dependency "win32ole", ">= 1.9"
-  end
 
   spec.add_development_dependency "bundler", ">= 1.14"
   spec.add_development_dependency "octokit", ">= 4.0", "< 9"

packaging/configs/projects/openbolt.rb

@@ -44,7 +44,7 @@
                    ManualLink: "https://puppet.com/docs/bolt/",
                  })
     proj.setting(:LicenseRTF, "wix/license/LICENSE.rtf")
-    proj.setting(:install_root, File.join("C:", proj.base_dir, proj.pl_company_id, proj.product_id))
+    proj.setting(:install_root, File.join("C:", proj.base_dir, proj.pl_company_id, proj.pl_product_id))
     proj.setting(:link_bindir, File.join(proj.install_root, "bin"))
 
     File.join(proj.datadir.sub(%r{^.*:/}, ''), 'PowerShell', 'Modules')

packaging/resources/windows/wix/powershell.wxs.erb

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='windows-1252'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <!-- Puppet Bolt Powershell Module -->
+  <!-- OpenBolt Powershell Module -->
   <Fragment>
     <ComponentGroup Id="PowerShellModuleComponentGroup">
       <Component

packaging/resources/windows/wix/properties.wxs.erb

@@ -26,7 +26,7 @@
     <!-- This text is placed as a literal string in the GUI -->
     <Property
       Id="WIXUI_EXITDIALOGOPTIONALTEXT"
-      Value="Puppet Bolt has been installed." />
+      Value="OpenBolt has been installed." />
 
     <!--
       Remembered Property Pattern
@@ -37,7 +37,7 @@
       <RegistrySearch
         Id="RecallInstallDir"
         Root="HKLM"
-        Key="SOFTWARE\<%= settings[:pl_company_name] %>\<%= settings[:product_id] %>"
+        Key="SOFTWARE\<%= settings[:pl_company_name] %>\<%= settings[:pl_product_id] %>"
         Name="RememberedInstallDir"
         Type="raw"
         Win64="yes" />

packaging/resources/windows/wix/registryEntries.wxs.erb

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='windows-1252'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
   <!--
-    Puppet Bolt Specific Registry Entries
+    OpenBolt Specific Registry Entries
     This overrides the generic file in the vanagon directory
   -->
   <Fragment>
@@ -13,7 +13,7 @@
 
         <RegistryKey
           Root="HKLM"
-          Key="SOFTWARE\<%= settings[:pl_company_name] %>\<%= settings[:product_id] %>">
+          Key="SOFTWARE\<%= settings[:pl_company_name] %>\<%= settings[:pl_product_id] %>">
           <!-- This is the default (aka 'unnamed') key value of this path -->
           <RegistryValue
             Type="integer"
@@ -36,7 +36,7 @@
 
         <RegistryKey
           Root="HKLM"
-          Key="SOFTWARE\<%= settings[:pl_company_name] %>\<%= settings[:product_id] %>"
+          Key="SOFTWARE\<%= settings[:pl_company_name] %>\<%= settings[:pl_product_id] %>"
           ForceCreateOnInstall="yes" >
 
           <RegistryValue

packaging/resources/windows/wix/shortcuts.wxs.erb

@@ -38,7 +38,7 @@
           On="uninstall"/>
         <RegistryValue
           Root="HKCU"
-          Key="SOFTWARE\<%= settings[:pl_company_name] %>\<%= settings[:product_id] %>\Documentation"
+          Key="SOFTWARE\<%= settings[:pl_company_name] %>\<%= settings[:pl_product_id] %>\Documentation"
           Name="installed"
           Value="1"
           Type="integer"

…ndows/wix/ui/PuppetBoltInstallDirDlg.wxs …windows/wix/ui/OpenBoltInstallDirDlg.wxspackaging/resources/windows/wix/ui/PuppetBoltInstallDirDlg.wxs renamed to packaging/resources/windows/wix/ui/OpenBoltInstallDirDlg.wxs packaging/resources/windows/wix/ui/PuppetBoltInstallDirDlg.wxs renamed to packaging/resources/windows/wix/ui/OpenBoltInstallDirDlg.wxs

@@ -41,7 +41,7 @@
       </Dialog>
 
       <InstallUISequence>
-        <Show Dialog="PuppetBoltWelcomeDlg" Before="ProgressDlg" Overridable="yes">NOT Installed OR PATCH</Show>
+        <Show Dialog="OpenBoltWelcomeDlg" Before="ProgressDlg" Overridable="yes">NOT Installed OR PATCH</Show>
       </InstallUISequence>
     </UI>
   </Fragment>