From a71a777790e677835d8a7176309708a1b88b93df Mon Sep 17 00:00:00 2001
From: Ales Erjavec <ales.erjavec@fri.uni-lj.si>
Date: Fri, 9 Nov 2018 16:11:20 +0100
Subject: [PATCH] condainstall.bat: Add conda.bat and activate.bat scripts
 again

conda 4.5 no longer installs them
---
 scripts/windows/condainstall.bat | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/scripts/windows/condainstall.bat b/scripts/windows/condainstall.bat
index ccf279e063a..4762cd4e024 100644
--- a/scripts/windows/condainstall.bat
+++ b/scripts/windows/condainstall.bat
@@ -6,6 +6,10 @@ rem Target install prefix
 set PREFIX=%~1
 rem Path to conda executable
 set CONDA=%~2
+rem Path to base conda env
+for /f %%f in ( '"%CONDA%" info --root' ) do (
+    set "CONDA_BASE_PREFIX=%%f"
+)
 
 if not exist "%PREFIX%\python.exe" (
     echo Creating a conda env in "%PREFIX%"
@@ -28,6 +32,25 @@ echo channels:         > "%PREFIX%\.condarc"
 echo   - conda-forge  >> "%PREFIX%\.condarc"
 echo   - defaults     >> "%PREFIX%\.condarc"
 
+rem # `conda create` (>=4.5) does not add the conda.bat script,
+rem # so we create it manually.
+set "CONDA_BAT=%PREFIX%\Scripts\conda.bat"
+if not exist "%CONDA_BAT%" (
+    echo @echo off>                    "%CONDA_BAT%"
+    echo setlocal>>                    "%CONDA_BAT%"
+    echo set "CONDA=%CONDA%">>         "%CONDA_BAT%"
+    echo set "CONDA_PREFIX=%PREFIX%">> "%CONDA_BAT%"
+    echo call "%CONDA%" %%*>>          "%CONDA_BAT%"
+    echo endlocal>>                    "%CONDA_BAT%"
+)
+
+rem # same for activate.bat
+set "ACTIVATE_BAT=%PREFIX%\Scripts\activate.bat"
+if not exist "%ACTIVATE_BAT%" (
+    echo @echo off >  "%ACTIVATE_BAT%"
+    echo call "%CONDA_BASE_PREFIX%\Scripts\activate.bat" "%PREFIX%" >> "%ACTIVATE_BAT%"
+)
+
 for %%f in ( *.tar.bz2 ) do (
     echo Installing: %%f
     "%CONDA%" install --yes  --copy --quiet --prefix "%PREFIX%" "%CD%\%%f" ^