From: W. Trevor King <wking@tremily.us>
Date: Wed, 9 Jul 2014 18:32:08 +0000 (-0700)
Subject: swc-windows-installer.py: Add missing space to 'c:\ProgramFiles'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=710dc4a440af4cf9420ef5082ac804295eceb5e0;p=swc-workshop.git

swc-windows-installer.py: Add missing space to 'c:\ProgramFiles'

This is the default for when ProgramFiles isn't set.  Windows
operating systems should always have that environment variable set, so
the default is probably only useful when you're testing the script on
a non-Windows system.
---

diff --git a/swc-windows-installer.py b/swc-windows-installer.py
index 769da4a..ff0423c 100755
--- a/swc-windows-installer.py
+++ b/swc-windows-installer.py
@@ -197,7 +197,7 @@ def create_nosetests_entry_point(python_scripts_directory):
 def get_r_bin_directory():
     """Locate the R bin directory (if R is installed
     """
-    pf = os.environ.get('ProgramFiles', r'c:\ProgramFiles')
+    pf = os.environ.get('ProgramFiles', r'c:\Program Files')
     bin_glob = os.path.join(pf, 'R', 'R-[0-9]*.[0-9]*.[0-9]*', 'bin')
     version_re = re.compile('^R-(\d+)[.](\d+)[.](\d+)$')
     paths = {}