From c1fc3a4ad49b6820a04ee9ffd8a789731a9dfa7e Mon Sep 17 00:00:00 2001 From: doyle Date: Fri, 16 Jul 2021 10:21:11 +1000 Subject: [PATCH] Some minor quality of life stuff --- win32_install.bat | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/win32_install.bat b/win32_install.bat index bd969ab..d1a21ed 100644 --- a/win32_install.bat +++ b/win32_install.bat @@ -185,7 +185,7 @@ REM ripgrep REM ---------------------------------------------------------------------------- set rg_sha256=a47ace6f654c5ffa236792fc3ee3fefd9c7e88e026928b44da801acb72124aa8 set rg_version=13.0.0 -set rg_zip=!downloads_dir!\win32_rg_v!rg_version!.7z +set rg_zip=!downloads_dir!\win32_rg_v!rg_version!.zip set rg_dir=!tools_dir!\ripgrep-!rg_version! set rg_subfolder=!rg_dir!\ripgrep-!rg_version!-x86_64-pc-windows-msvc if not exist !rg_dir! ( @@ -215,7 +215,9 @@ set python_scripts_bin_dir=!python_bin_dir!\Scripts REM ---------------------------------------------------------------------------- REM Super Terminal REM ---------------------------------------------------------------------------- -set terminal_script=!root_dir!\terminal.bat +set terminal_script=!root_dir!\win32_terminal.bat +set msvc_script=!tools_dir!\MSVC-2019-v16.9.2-VC-v14.28.29910-Win10-SDK-v10.0.19041.0-x64\msvc_env_x64.bat + echo @echo off> "!terminal_script!" echo set PATH=!gpg_w32_bin_dir!;%%PATH%%>> "!terminal_script!" echo set PATH=!gvim_dir!;%%PATH%%>> "!terminal_script!" @@ -229,8 +231,8 @@ echo set PYTHONHOME=!python_bin_dir!>> "!terminal_script!" echo set HOME=!home_dir!>> "!terminal_script!" echo set HOMEPATH=!home_dir!>> "!terminal_script!" echo set USERPROFILE=!home_dir!>> "!terminal_script!" -echo call !tools_dir!\MSVC-2019-v16.9.2-VC-v14.28.29910-Win10-SDK-v10.0.19041.0-x64\msvc_env_x64.bat>> "!terminal_script!" -echo !cmder_dir!\cmder.exe>> "!terminal_script!" +echo if exist "!msvc_script!" call "!msvc_script!">> "!terminal_script!" +echo call "!cmder_dir!\cmder.exe" %%*>> "!terminal_script!" REM ---------------------------------------------------------------------------- REM CTags Helper Script