From 30d8b1921cbbbe052003f375dfa7a2c161741671 Mon Sep 17 00:00:00 2001 From: doyle Date: Sat, 20 Feb 2021 11:47:30 +1100 Subject: [PATCH 1/2] Dump downloads to download folder --- .gitignore | 2 ++ win32_install.bat | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f255ea4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +Home +Cmder diff --git a/win32_install.bat b/win32_install.bat index 59a5b80..15c7406 100644 --- a/win32_install.bat +++ b/win32_install.bat @@ -5,6 +5,7 @@ set root=%~dp0 set home=%root%\home set cmder_root=%root%\Cmder set installer_root=%root%\Installer +set downloads_root=%root%\Downloads set vim_root=%home%\vimfiles set tools_root=%root%\Tools set compiler_root=%tools_root%\Compiler @@ -13,12 +14,13 @@ if not exist %home% mkdir %home% if not exist %installer_root% mkdir %installer_root% if not exist %tools_root% mkdir %tools_root% if not exist %compiler_root% mkdir %compiler_root% +if not exist %downloads_root% mkdir %downloads_root% REM REM Cmder REM set cmder_version=v1.3.16 -set cmder_zip=%installer_root%\win32_cmder_%cmder_version%.7z +set cmder_zip=%downloads_root%\win32_cmder_%cmder_version%.7z if exist "%cmder_root%" ( echo - [Cache] Cmder already installed at %cmder_root% ) else ( @@ -42,7 +44,7 @@ call :CopyFile "%installer_root%\clang-format-style-file" "%home%\_clang-format" REM REM GVim, Vim Plug, Vim Config REM -set gvim_zip=%installer_root%\win32_gvim_x64.7z +set gvim_zip=%downloads_root%\win32_gvim_x64.7z set gvim_path=%tools_root%\GVim if exist "%gvim_path%" ( echo - [Cache] GVim already installed at %gvim_path% @@ -86,7 +88,7 @@ REM Zig REM set zig_version=0.7.0 set zig_file=zig-windows-x86_64-%zig_version%.zip -set zig_zip=%installer_root%\win32_%zig_file% +set zig_zip=%downloads_root%\win32_%zig_file% set zig_path=%compiler_root%\zig-windows-x86_64-%zig_version% if exist "%zig_path%" ( echo - [Cache] Zig already installed at %zig_path% @@ -101,7 +103,7 @@ REM set python_version=3.9.0.2dot set python_version_nodot=3902 set python_url=https://github.com/winpython/winpython/releases/download/3.0.20201028/Winpython64-%python_version%.exe -set python_zip=%installer_root%\win32_Winpython64-%python_version%.exe +set python_zip=%downloads_root%\win32_Winpython64-%python_version%.exe set python_path=%tools_root%\WPy64-%python_version_nodot% if exist "%python_path%" ( echo - [Cache] Python already installed at %python_path% From 8f97ab84f445179ecc48455e49dbf5c97008fbef Mon Sep 17 00:00:00 2001 From: doyle Date: Sat, 20 Feb 2021 11:47:49 +1100 Subject: [PATCH 2/2] Ignore downloads folder --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f255ea4..94a205e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ Home Cmder +Downloads