commit c494899c17d481a019fb6aaa5b8191231f19768e
author Walt <32001362+Walt280@users.noreply.github.com> Sat Jul 11 10:38:17 2020 -0400
committer GitHub <noreply@github.com> Sat Jul 11 07:38:17 2020 -0700
tree 6da3ce6cb551ea037a0bd2d73760922834a07ae6
parent d37abed2de63f2e24d020cdcd64845b74ac1b50a

Change EMSDK_SET_ENV to output correct filename for powershell. (#546)

Rename write_set_env_bat to write_set_env_script.

emsdk.py

diff --git a/emsdk.py b/emsdk.py
index 197f370..7ac39dd 100755
--- a/emsdk.py
+++ b/emsdk.py
@@ -169,7 +169,11 @@
 if os.path.exists(os.path.join(emsdk_path(), '.emscripten')):
   emscripten_config_directory = emsdk_path()
 
-EMSDK_SET_ENV = os.path.join(emsdk_path(), 'emsdk_set_env.bat')
+EMSDK_SET_ENV = ""
+if POWERSHELL:
+  EMSDK_SET_ENV = os.path.join(emsdk_path(), 'emsdk_set_env.ps1')
+else:
+  EMSDK_SET_ENV = os.path.join(emsdk_path(), 'emsdk_set_env.bat')
 
 ARCHIVE_SUFFIXES = ('zip', '.tar', '.gz', '.xz', '.tbz2', '.bz2')
 
@@ -2467,7 +2471,7 @@
                      os.path.join(out_cache, filename))
 
 
-def write_set_env_bat(env_string):
+def write_set_env_script(env_string):
   assert(WINDOWS)
   open(EMSDK_SET_ENV, 'w').write(env_string)
 
@@ -2496,7 +2500,7 @@
   # required.
   if WINDOWS:
     env_string = construct_env(tools_to_activate)
-    write_set_env_bat(env_string)
+    write_set_env_script(env_string)
 
   # Apply environment variables to global all users section.
   if WINDOWS and permanently_activate:
@@ -3024,7 +3028,7 @@
     tools_to_activate = process_tool_list(tools_to_activate, log_errors=True)
     env_string = construct_env(tools_to_activate)
     if WINDOWS and not BASH:
-      write_set_env_bat(env_string)
+      write_set_env_script(env_string)
     else:
       sys.stdout.write(env_string)
     return 0