Merge branch 'master' of git@github.com:Shyotl/SingularityViewer.git

indra/develop.py

@@ -628,7 +628,7 @@ class WindowsSetup(PlatformSetup):
 
     def run(self, command, name=None):
         '''Run a program.  If the program fails, raise an exception.'''
-        ret = os.system(command.encode('utf-8'))
+        ret = os.system(command)
         if ret:
             if name is None:
                 name = command.split(None, 1)[0]

indra/lib/python/indra/util/llmanifest.py

@@ -394,14 +394,14 @@ class LLManifest(object):
         debugging/informational purpoases, prints out the command's
         output as it is received."""
         print "Running command:", command
-        fd = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        fd = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
         lines = []
         while True:
-            lines.append(fd.stdout.readline().rstrip('\n'))
+            lines.append(fd.stdout.readline())
             if lines[-1] == '':
                 break
             else:
-                print lines[-1],
+                print lines[-1].rstrip('\n'),
         output = ''.join(lines)
         if fd.returncode:
             raise RuntimeError(

indra/newview/viewer_manifest.py

@@ -358,11 +358,11 @@ class WindowsManifest(ViewerManifest):
             if installed_dir != out_path:
                 if install:
                     out_path = installed_dir
-                    result += 'SetOutPath ' + out_path + '\n'
+                    result += 'SetOutPath "' + out_path + '"\n'
             if install:
                 result += 'File "' + pkg_file + '"\n'
             else:
-                result += 'Delete ' + wpath(os.path.join('$INSTDIR', rel_file)) + '\n'
+                result += 'Delete "' + wpath(os.path.join('$INSTDIR', rel_file)) + '"\n'
 
         # at the end of a delete, just rmdir all the directories
         if not install: