Fixes for start.bat

cheungxi · Mar 21, 2019 · 7455215 · 7455215
1 parent 38fca9e
commit 7455215
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/dev/start.bat b/dev/start.bat
@@ -22,12 +22,26 @@ set PYTHONHOME=
 @powershell.exe -NoProfile -Command (new-object System.Net.WebClient).DownloadFile('https://repo.continuum.io/miniconda/Miniconda%pyver%-latest-Windows-x86_64.exe','miniconda.exe')
 @ECHO Installing miniconda to: %devenv%
 @start /wait "" miniconda.exe /InstallationType=JustMe /RegisterPython=0 /AddToPath=0 /S /D=%CD%\%devenv%
-@ECHO ^>^> conda update -p %CD%\%devenv% -yq --all
-@CALL "%devenv%\Scripts\conda" update -p %CD%\%devenv% -yq --all
-@ECHO ^>^> conda install -yq -p %CD%\%devenv% --file dev/test-requirements.txt -c defaults -c conda-forge
-@CALL "%devenv%\Scripts\conda" install -p %CD%\%devenv% -yq --file dev/test-requirements.txt -c defaults -c conda-forge
+call %devenv%\Scripts\activate.bat
+conda install -y defaults::git
+@ECHO exit at this point.
 
 :ALREADY_INSTALLED
+call %devenv%\Scripts\activate.bat
+
+set CONDA_BAT=
+set CONDA_EXE=
+set CONDA_SHLVL=
+set PYTHONPATH=
+set PYTHONHOME=
+
+@ECHO               ^>^> conda update -p %CD%\%devenv% -yq --all
+@CALL "%devenv%\Scripts\conda" update -p %CD%\%devenv% -yq --all
+@ECHO               ^>^> conda install -yp %CD%\%devenv% defaults::git
+@CALL "%devenv%\Scripts\conda" install -yp %CD%\%devenv% defaults::git
+@ECHO               ^>^> conda install -yq -p %CD%\%devenv% --file dev/test-requirements.txt -c defaults -c conda-forge
+@CALL "%devenv%\Scripts\conda" install -yq -p %CD%\%devenv% --file dev/test-requirements.txt -c defaults -c conda-forge
+
 @CALL "%devenv%\python" -m conda init --dev cmd.exe > NUL
 
 :INIT_BUILD