revert keying on CONDA_BAT

mukteshkrmishra · Jun 15, 2018 · 0cb3413 · 0cb3413
1 parent fbd2087
commit 0cb3413
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/conda/shell/condacmd/conda_hook.bat b/conda/shell/condacmd/conda_hook.bat
@@ -3,7 +3,7 @@
 @REM The file name is conda_hook.bat rather than conda-hook.bat because conda will see
 @REM the latter as a 'conda hook' command.
 
-@IF DEFINED CONDA_BAT GOTO :EOF
+@IF DEFINED CONDA_SHLVL GOTO :EOF
 
 @FOR %%F in ("%~dp0") do @SET __condacmd_dir=%%~dpF
 @SET "PATH=%__condacmd_dir%;%PATH%"
@@ -16,5 +16,4 @@
 
 @DOSKEY conda=%CONDA_BAT% $*
 
-@IF DEFINED CONDA_SHLVL GOTO :EOF
 @SET CONDA_SHLVL=0
diff --git a/tests/test_activate.py b/tests/test_activate.py
@@ -1123,9 +1123,9 @@ class InteractiveShell(object):
         },
         'cmd.exe': {
             'activator': 'cmd.exe',
-            'init_command': 'set CONDA_SHLVL= '
-                            '&& conda\\shell\\condacmd\\conda_hook.bat '
-                            '&& set CONDA_EXE="python -m conda"',
+            'init_command': 'set "CONDA_SHLVL=" '
+                            '&& @CALL conda\\shell\\condacmd\\conda_hook.bat '
+                            '&& set "CONDA_EXE=python -m conda"',
             'print_env_var': '@echo %%%s%%',
         },
         'csh': {