Please review pull request #187: Use cygpath to get the Puppet Enterprise binary directory instead of har... opened by (mkincaid)

Description:

...d-coding.

This fixes 64-bit Windows, where it is "Program Files (x86)".

  • Opened: Thu Mar 29 21:29:44 UTC 2012
  • Based on: puppetlabs:master (232e21a5e6de2f2139153b7378259b3a2cc9f64c)
  • Requested merge: mkincaid:windows_bindir_fix (033614135c8bbbfd377486518d2ea63593fd3a3e)

Diff follows:

diff --git a/lib/host/windows.rb b/lib/host/windows.rb
index af6fb85..fcfcdf6 100644
--- a/lib/host/windows.rb
+++ b/lib/host/windows.rb
@@ -18,7 +18,7 @@ class Host < Host
       'group'        => 'Administrators',
       'puppetpath'   => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
       'puppetvardir' => '`cygpath -smF 35`/PuppetLabs/puppet/var',
-      'puppetbindir' => '/cygdrive/c/Program Files/Puppet Labs/Puppet Enterprise/bin',
+      'puppetbindir' => '`cygpath -F 38`/Puppet Labs/Puppet Enterprise/bin',
     }
 
     DEFAULTS = {

    

--
You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.

Reply via email to