Made compatible with 32 bit operating systems.

new23d · Jun 4, 2014 · 56fefcb · 56fefcb
1 parent a650f12
commit 56fefcb
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -38,9 +38,9 @@ You could download a package I have compiled from the _release_ tab above, or bu
 0. Set path to WiX binaries: ```set PATH="%ProgramFiles(x86)%\WiX Toolset v3.8\bin";%PATH%```
 0. ```heat dir ..\mco -gg -sfrag -template fragment -ke -cg Tarball -dr ProgramFilesFolder_MCollective -srd -out files.wxs```
 0. ```candle files.wxs ..\wxs\mcollective.wxs```
-0. ```light -b ..\mco files.wixobj mcollective.wixobj -out ..\msi\mcollective-2.5.1001.msi```
+0. ```light -b ..\mco files.wixobj mcollective.wixobj -out ..\msi\mcollective-2.5.1002.msi```
 
 
 ## Versioning
 
-Due to idiosyncrasies and limitations of the Windows Installer around upgrades, the version numbers here reflect the upstream MCollective major and minor version number accurately. The patch number is then first multiplied by 1000 and my own release number added afterwards. Therefore, 2.5.1001 here means 2.5.1 release 1.
+Due to idiosyncrasies and limitations of the Windows Installer around upgrades, the version numbers here reflect the upstream MCollective major and minor version number accurately. The patch number is then first multiplied by 1000 and my own release number added afterwards. Therefore, 2.5.1002 here means 2.5.1 release 2.
diff --git a/opt/facter_cef.bat b/opt/facter_cef.bat
@@ -1,15 +1,30 @@
 @echo off
 setlocal enabledelayedexpansion
 
-set var_puppet_key_name="HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Puppet Labs\Puppet"
+if defined ProgramData (
+ set var_platform_program_data=%ProgramData%
+)
+
+if not defined ProgramData (
+ set var_platform_program_data=%ALLUSERSPROFILE%\Application Data
+)
+
+if defined ProgramFiles(x86) (
+ set "var_programfilesx86_dir=%ProgramFiles(x86)%"
+ set var_puppet_key_name="HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Puppet Labs\Puppet"
+)
+
+if not defined ProgramFiles(x86) (
+ set var_programfilesx86_dir=%ProgramFiles%
+ set var_puppet_key_name="HKEY_LOCAL_MACHINE\SOFTWARE\Puppet Labs\Puppet"
+)
+
 set var_puppet_value_name="RememberedInstallDir"
 
 for /f "usebackq skip=1 tokens=1,2*" %%a in (`reg query %var_puppet_key_name% /v %var_puppet_value_name%`) do (set var_puppet_base_dir=%%c)
 
-set var_mcollective_base_dir=%ProgramFiles(x86)%\MCollective\
-set var_mcollective_etc_dir=%ProgramData%\MCollective\etc\
-
-set var_programfilesx86_dir=%ProgramFiles(x86)%
+set var_mcollective_base_dir=%var_programfilesx86_dir%\MCollective\
+set var_mcollective_etc_dir=%var_platform_program_data%\MCollective\etc\
 
 call "%var_puppet_base_dir%bin\environment.bat"
 

diff --git a/opt/service.bat b/opt/service.bat
@@ -1,18 +1,31 @@
 @echo off
 setlocal enabledelayedexpansion
 
-set var_puppet_key_name="HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Puppet Labs\Puppet"
+if defined ProgramData (
+ set var_platform_program_data=%ProgramData%
+)
+
+if not defined ProgramData (
+ set var_platform_program_data=%ALLUSERSPROFILE%\Application Data
+)
+
+if defined ProgramFiles(x86) (
+ set "var_programfilesx86_dir=%ProgramFiles(x86)%"
+ set var_puppet_key_name="HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Puppet Labs\Puppet"
+)
+
+if not defined ProgramFiles(x86) (
+ set var_programfilesx86_dir=%ProgramFiles%
+ set var_puppet_key_name="HKEY_LOCAL_MACHINE\SOFTWARE\Puppet Labs\Puppet"
+)
+
 set var_puppet_value_name="RememberedInstallDir"
 
 for /f "usebackq skip=1 tokens=1,2*" %%a in (`reg query %var_puppet_key_name% /v %var_puppet_value_name%`) do (set var_puppet_base_dir=%%c)
 
-if defined ProgramData (set var_platform_program_data=%ProgramData%) else (set var_platform_program_data=%ALLUSERSPROFILE%\Application Data)
-
-set var_mcollective_base_dir=%ProgramFiles(x86)%\MCollective\
+set var_mcollective_base_dir=!var_programfilesx86_dir!\MCollective\
 set var_mcollective_etc_dir=%var_platform_program_data%\MCollective\etc\
 
-set var_programfilesx86_dir=%ProgramFiles(x86)%
-
 if not exist "%var_mcollective_etc_dir%server.cfg" (
 echo ^
 main_collective = mcollective^

diff --git a/wxs/mcollective.wxs b/wxs/mcollective.wxs
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
- <Product Name='MCollective' Version='2.5.1001' Id='*' UpgradeCode='D1B7E318-BED6-430C-9194-9427BEA29797' Language='1033' Codepage='1252' Manufacturer='new23d'>
+ <Product Name='MCollective' Version='2.5.1002' Id='*' UpgradeCode='D1B7E318-BED6-430C-9194-9427BEA29797' Language='1033' Codepage='1252' Manufacturer='new23d'>
  <Package Id='*' Compressed='yes' InstallerVersion='300' />
  <Media Id='1' Cabinet='mcollective' EmbedCab='yes' />
 
@@ -58,7 +58,7 @@
  </Directory>
  </Directory>
 
- <CustomAction Id='FacterCEFScheduledTaskCreate' Directory='Opt' ExeCommand='schtasks /create /ru system /sc daily /tn Facter_CEF /tr "%ProgramFiles(x86)%\MCollective\opt\facter_cef.bat" /ri 10 /f' Execute='deferred' Impersonate='no' />
+ <CustomAction Id='FacterCEFScheduledTaskCreate' Directory='Opt' ExeCommand='schtasks /create /ru system /sc daily /tn Facter_CEF /tr "\"[ProgramFilesFolder]MCollective\opt\facter_cef.bat\"" /ri 10 /f' Execute='deferred' Impersonate='no' />
  <CustomAction Id='FacterCEFScheduledTaskDelete' Directory='Log' ExeCommand='schtasks /delete /f /tn Facter_CEF' Execute='commit' Impersonate='no' />
 
  <InstallExecuteSequence>