From 4fbeedc78752c09fd9a0c5974af00a51de1e2a3e Mon Sep 17 00:00:00 2001
From: Joey Payne <jyapayne@gmail.com>
Date: Wed, 11 Nov 2015 16:40:14 -0700
Subject: [PATCH] Modified bat file code to hopefully print values.

---
 command_line.py    |  8 +++-----
 files/env_vars.bat | 12 +++++++++++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/command_line.py b/command_line.py
index c4f0ef2..ea50c33 100644
--- a/command_line.py
+++ b/command_line.py
@@ -940,7 +940,7 @@ class CommandBase(object):
                 for i, ex_dir in enumerate(export_dirs):
                     opt = export_opts[i]
                     export_dict[opt+'_dir'] = ex_dir
-                    ex_dir_vars += 'set EXPORT_DIRS[{}]={} & '.format(i, ex_dir)
+                    ex_dir_vars += 'set EXPORT_DIRS[{}]={}\n'.format(i, ex_dir)
 
                 env_vars = env_contents.format(proj_dir=self.project_dir(),
                                                proj_name=self.project_name(),
@@ -948,11 +948,9 @@ class CommandBase(object):
                                                num_dirs=len(export_dirs),
                                                export_dirs=ex_dir_vars,
                                                **export_dict)
-                batcontents = '{}{}'.format(env_vars.replace('\n',''), contents.replace('\n', ' & '))
-                if batcontents.endswith(' & '):
-                    batcontents = batcontents[:-3]
+                batcontents = '{}{}'.format(env_vars, contents)
 
-                command = ['cmd', '/c', "'" + batcontents + "'"]
+                command = ['cmd', '/c', batcontents]
 
             proc = subprocess.Popen(' '.join(command), stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
             output, error = proc.communicate()
diff --git a/files/env_vars.bat b/files/env_vars.bat
index d2624bf..00a8690 100644
--- a/files/env_vars.bat
+++ b/files/env_vars.bat
@@ -1 +1,11 @@
-set PROJECT_DIR={proj_dir} & set PROJECT_NAME={proj_name} & set EXPORT_DIR={export_dir} & set MAC64_EXPORT_DIR={mac-x64_dir} & set MAC32_EXPORT_DIR={mac-x32_dir} & set WIN64_EXPORT_DIR={win-x64_dir} & set WIN32_EXPORT_DIR={win-x32_dir} & set LINUX64_EXPORT_DIR={linux-x64_dir} & set LINUX32_EXPORT_DIR={linux-x32_dir} & set NUM_DIRS={num_dirs} & {export_dirs}
+set "PROJECT_DIR={proj_dir}"
+set "PROJECT_NAME={proj_name}"
+set "EXPORT_DIR={export_dir}"
+set "MAC64_EXPORT_DIR={mac-x64_dir}"
+set "MAC32_EXPORT_DIR={mac-x32_dir}"
+set "WIN64_EXPORT_DIR={win-x64_dir}"
+set "WIN32_EXPORT_DIR={win-x32_dir}"
+set "LINUX64_EXPORT_DIR={linux-x64_dir}"
+set "LINUX32_EXPORT_DIR={linux-x32_dir}"
+set "NUM_DIRS={num_dirs}"
+{export_dirs}