From c74326de023a5f5b4005684a05cd87116efce8bc Mon Sep 17 00:00:00 2001
From: oobabooga <112222186+oobabooga@users.noreply.github.com>
Date: Fri, 22 Sep 2023 10:37:22 -0700
Subject: [PATCH] Fixes by @jllllll

---
 cmd_windows.bat    | 2 +-
 start_windows.bat  | 2 +-
 start_wsl.bat      | 2 +-
 update_windows.bat | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmd_windows.bat b/cmd_windows.bat
index b219cf66..82e1dac9 100755
--- a/cmd_windows.bat
+++ b/cmd_windows.bat
@@ -11,7 +11,7 @@ set TMP=%cd%\installer_files
 set TEMP=%cd%\installer_files
 
 @rem deactivate existing conda envs as needed to avoid conflicts
-(conda deactivate && conda deactivate && conda deactivate) 2>null
+(conda deactivate && conda deactivate && conda deactivate) 2>nul
 
 @rem config
 set CONDA_ROOT_PREFIX=%cd%\installer_files\conda
diff --git a/start_windows.bat b/start_windows.bat
index 77ba93bf..c75708ab 100755
--- a/start_windows.bat
+++ b/start_windows.bat
@@ -18,7 +18,7 @@ set TMP=%cd%\installer_files
 set TEMP=%cd%\installer_files
 
 @rem deactivate existing conda envs as needed to avoid conflicts
-(conda deactivate && conda deactivate && conda deactivate) 2>null
+(conda deactivate && conda deactivate && conda deactivate) 2>nul
 
 @rem config
 set INSTALL_DIR=%cd%\installer_files
diff --git a/start_wsl.bat b/start_wsl.bat
index 26d2f8a6..d7bacead 100755
--- a/start_wsl.bat
+++ b/start_wsl.bat
@@ -5,7 +5,7 @@ cd /D "%~dp0"
 set PATH=%PATH%;%SystemRoot%\system32
 
 @rem sed -i 's/\x0D$//' ./wsl.sh converts newlines to unix format in the wsl script
-call wsl -e bash -lic "sed -i 's/\x0D$//' ./wsl.sh; source ./wsl.sh $@"
+call wsl -e bash -lic "sed -i 's/\x0D$//' ./wsl.sh; source ./wsl.sh %*"
 
 :end
 pause
diff --git a/update_windows.bat b/update_windows.bat
index 6f01ee03..944ec32b 100755
--- a/update_windows.bat
+++ b/update_windows.bat
@@ -11,7 +11,7 @@ set TMP=%cd%\installer_files
 set TEMP=%cd%\installer_files
 
 @rem deactivate existing conda envs as needed to avoid conflicts
-(conda deactivate && conda deactivate && conda deactivate) 2>null
+(conda deactivate && conda deactivate && conda deactivate) 2>nul
 
 @rem config
 set CONDA_ROOT_PREFIX=%cd%\installer_files\conda