Merge pull request #12 from OpenVoxProject/fix_windows_paths

Set paths back to PuppetLabs/Puppet on Windows

Author: nmburgan

Diff for: configs/projects/_shared-agent-settings.rb

@@ -30,17 +30,20 @@
 proj.setting(:buildsources_url, "#{proj.artifactory_url}/generic/buildsources")
 
 if platform.is_windows?
+  # In order not to break people, we need to keep the paths Puppetlabs/Puppet
   proj.setting(:company_id, "VoxPupuli")
+  proj.setting(:pl_company_id, "PuppetLabs")
   proj.setting(:product_id, "OpenVox")
+  proj.setting(:pl_product_id, "Puppet")
   if platform.architecture == "x64"
     proj.setting(:base_dir, "ProgramFiles64Folder")
   else
     proj.setting(:base_dir, "ProgramFilesFolder")
   end
   # We build for windows not in the final destination, but in the paths that correspond
   # to the directory ids expected by WIX. This will allow for a portable installation (ideally).
-  proj.setting(:install_root, File.join("C:", proj.base_dir, proj.company_id, proj.product_id))
-  proj.setting(:sysconfdir, File.join("C:", "CommonAppDataFolder", proj.company_id))
+  proj.setting(:install_root, File.join("C:", proj.base_dir, proj.pl_company_id, proj.pl_product_id))
+  proj.setting(:sysconfdir, File.join("C:", "CommonAppDataFolder", proj.pl_company_id))
   proj.setting(:tmpfilesdir, "C:/Windows/Temp")
 else
   proj.setting(:install_root, "/opt/puppetlabs")

Diff for: configs/projects/_shared-client-tools-runtime.rb

@@ -30,7 +30,7 @@
 
 if platform.is_windows?
   # Windows Installer settings.
-  proj.setting(:company_id, "VoxPupuli")
+  proj.setting(:company_id, "PuppetLabs")
   proj.setting(:product_id, "Client")
   if platform.architecture == "x64"
     proj.setting(:base_dir, "ProgramFiles64Folder")

Diff for: configs/projects/bolt-runtime.rb

@@ -29,7 +29,7 @@
   proj.identifier "org.voxpupuli"
 
   if platform.is_windows?
-    proj.setting(:company_id, "VoxPupuli")
+    proj.setting(:company_id, "PuppetLabs")
     proj.setting(:product_id, "Bolt")
     if platform.architecture == "x64"
       proj.setting(:base_dir, "ProgramFiles64Folder")

Diff for: configs/projects/pdk-runtime.rb

@@ -32,7 +32,7 @@
 
   if platform.is_windows?
     proj.setting(:base_dir, 'ProgramFiles64Folder')
-    proj.setting(:company_id, 'VoxPupuli')
+    proj.setting(:company_id, 'PuppetLabs')
     proj.setting(:product_id, 'DevelopmentKit')
     proj.setting(:install_root, File.join('C:', proj.base_dir, proj.company_id, proj.product_id))
     proj.setting(:prefix, proj.install_root)