Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Use cygpath to get the Puppet Enterprise binary directory instead of har... #187

Merged
merged 1 commit into from

3 participants

@mkincaid

...d-coding.

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

Michael Kincaid Use cygpath to get the Puppet Enterprise binary directory instead of …
…hard-coding.

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

@mkincaid So I think this is the right thing, except that our win2003r2-64-1 acceptance test VM only has a 'Program Files'' directory but not a 'Program Files (x86)' directory and it is definitely 64-bit. I'm just wondering if folder id 38 wil resolve to the correct known folder in this situation where the (x86) directory is not present.

@mkincaid

I'm mystified as to why that VM wouldn't have a "Program Files (x86)" directory. That's been around as long as 64-bit Windows (e.g. http://support.microsoft.com/kb/896456).

Nonetheless, I'll see if I can get on that VM and ensure this does the right thing in that case too.

@mkincaid

It seems that win2003r2-64-1 may actually be running 32-bit Windows. systeminfo returns:
System type: X86-based PC

In any event, on this machine cygpath -F 38 returns /cygdrive/c/Program Files, which is as desired.

@djm68 djm68 merged commit a3c5e89 into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 29, 2012
  1. Use cygpath to get the Puppet Enterprise binary directory instead of …

    Michael Kincaid authored
    …hard-coding.
    
    This fixes 64-bit Windows, where it is "Program Files (x86)".
This page is out of date. Refresh to see the latest.
Showing with 1 addition and 1 deletion.
  1. +1 −1  lib/host/windows.rb
View
2  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 = {
Something went wrong with that request. Please try again.