From 01c2d70c16694d0a85b2c49e7dd5b0a86a8c727f Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Sun, 16 Sep 2018 13:33:08 +0200
Subject: [PATCH] Configurable dev env for Windows
---
windows/Dockerfile | 3 +--
windows/{VsDevSh.ps1 => VsDevEnv.ps1} | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
rename windows/{VsDevSh.ps1 => VsDevEnv.ps1} (85%)
diff --git a/windows/Dockerfile b/windows/Dockerfile
index a4c53bc..17972fe 100644
--- a/windows/Dockerfile
+++ b/windows/Dockerfile
@@ -63,5 +63,4 @@ RUN python -m pip --no-cache-dir install --no-warn-script-location \
matplotlib \
pandas
-COPY VsDevSh.ps1 C:/VsDevSh.ps1
-SHELL ["powershell", "-NoProfile", "-ExecutionPolicy Bypass", "-Command", "$ErrorActionPreference = 'Stop';", "C:/VsDevSh.ps1;"]
\ No newline at end of file
+COPY VsDevEnv.ps1 C:/VsDevEnv.ps1
\ No newline at end of file
diff --git a/windows/VsDevSh.ps1 b/windows/VsDevEnv.ps1
similarity index 85%
rename from windows/VsDevSh.ps1
rename to windows/VsDevEnv.ps1
index 8a59baf..649c7e8 100644
--- a/windows/VsDevSh.ps1
+++ b/windows/VsDevEnv.ps1
@@ -1,5 +1,5 @@
pushd "C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/Common7/Tools"
-cmd /c "VsDevCmd.bat&set" |
+cmd /c "VsDevCmd.bat $args & set" |
foreach {
if ($_ -match "=") {
$v = $_.split("="); set-item -force -path "ENV:\$($v[0])" -value "$($v[1])"
--
GitLab