installer: Revamp

.gitignore

@@ -1,3 +1,4 @@
-Home
+Docs
-Cmder
 Downloads
+Home
+Tools

Installer/win_portable-msvc-readme.md

@@ -0,0 +1,9 @@
+This downloads standalone 64-bit MSVC compiler, linker & other tools, also headers/libraries from Windows SDK into portable folder, without installing Visual Studio. Has bare minimum components - no UWP/Store/WindowsRT stuff, just files & tools for 64-bit native desktop app development.
+
+Run `python.exe portable-msvc.py` and it will download output into `msvc` folder. By default it will download latest available MSVC & Windows SDK - currently v14.31 and v10.0.22000.0.
+
+You can list available versions with `python.exe portable-msvc.py --show-versions` and then pass versions you want with `--msvc-version` and `--sdk-version` arguments.
+
+To use cl.exe/link.exe from output folder, first run `setup.bat` - after that PATH/INCLUDE/LIB env variables will be setup to use all the tools as usual. You can also use clang-cl.exe with these includes & libraries.
+
+To use clang-cl.exe without running setup.bat, pass extra `/winsysroot msvc` argument (msvc is folder name where output is stored).

linux_install.sh

@@ -25,13 +25,13 @@ sudo apt install exuberant-ctags neovim clang-format ripgrep
 # ------------------------------------------------------------------------------
 # NVim
 # ------------------------------------------------------------------------------
-cp --force ${script_dir}/Installer/_vimrc ~/.vimrc
+cp --force ${script_dir}/Installer/os_vimrc ~/.vimrc
+cp --force ${script_dir}/Installer/os_clang_format_style_file ~/_clang-format
 cp --force ${script_dir}/Installer/unix_nvim_init.vim ~/.config/nvim/init.vim
-cp --force ${script_dir}/Installer/clang_format_style_file ~/_clang-format
 
 # ------------------------------------------------------------------------------
 # Ctags
 # ------------------------------------------------------------------------------
 rm --force ${bin_dir}/ctags_cpp.sh
 echo ctags --c++-kinds=+p --fields=+iaS --extra=+q --language-force=C++ \$\@ >> ${bin_dir}/ctags_cpp.sh
-chmod +x Bin/ctags_cpp.sh
+chmod +x ${bin_dir}/ctags_cpp.sh

win_install.bat

@@ -7,21 +7,20 @@ REM ----------------------------------------------------------------------------
 set root_dir=%~dp0
 
 set home_dir=!root_dir!Home
-set install_dir=!root_dir!Installer
+set installer_dir=!root_dir!Installer
 set tools_dir=!root_dir!Tools
+set downloads_dir=!root_dir!Downloads
 if not exist !home_dir! mkdir !home_dir!
-if not exist !install_dir! mkdir !install_dir!
 if not exist !tools_dir! mkdir !tools_dir!
+if not exist !downloads_dir! mkdir !downloads_dir!
 
-set downloads_dir=!install_dir!\Downloads
 set vim_dir=!home_dir!\vimfiles
 set bin_dir=!tools_dir!\binaries
-if not exist !downloads_dir! mkdir !downloads_dir!
 if not exist !vim_dir! mkdir !vim_dir!
 if not exist !bin_dir! mkdir !bin_dir!
 
-set tmp_terminal_script=!root_dir!win32_terminal.bat.tmp
+set tmp_terminal_script=!tools_dir!\win_terminal.bat.tmp
-set terminal_script=!root_dir!win32_terminal.bat
+set terminal_script=!tools_dir!\win_terminal.bat
 echo @echo off> "!tmp_terminal_script!"
 echo set HOME=!home_dir!>> "!tmp_terminal_script!"
 echo set HOMEPATH=!home_dir!>> "!tmp_terminal_script!"
@@ -50,17 +49,17 @@ set zip7_bootstrap_sha256=2a3afe19c180f8373fa02ff00254d5394fec0349f5804e0ad2f606
 set zip7_bootstrap_exe_sha256=c136b1467d669a725478a6110ebaaab3cb88a3d389dfa688e06173c066b76fcf
 set zip7_bootstrap_version=920
 
-set zip7_bootstrap_zip=!downloads_dir!\win32_7zip_bootstrap_v!zip7_bootstrap_version!.zip
+set zip7_bootstrap_zip=!downloads_dir!\7zip_bootstrap_v!zip7_bootstrap_version!.zip
 set zip7_bootstrap_dir=!tools_dir!\7zip_bootstrap-!zip7_bootstrap_version!
 set zip7_bootstrap_exe=!zip7_bootstrap_dir!\7za.exe
 
 if not exist "!zip7_bootstrap_exe!" (
     call :DownloadFile "https://www.7-zip.org/a/7za!zip7_bootstrap_version!.zip" "!zip7_bootstrap_zip!" || exit /B
-    call :VerifyFileSHA256 "!zip7_bootstrap_zip!" "!zip7_bootstrap_sha256!" || exit /B
+    call :FileHashCheck sha256 "!zip7_bootstrap_zip!" "!zip7_bootstrap_sha256!" || exit /B
 )
 if not exist "!zip7_bootstrap_dir!" powershell "Expand-Archive !zip7_bootstrap_zip! -DestinationPath !zip7_bootstrap_dir!" || exit /B
 
-call :VerifyFileSHA256 "!zip7_bootstrap_exe!" "!zip7_bootstrap_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!zip7_bootstrap_exe!" "!zip7_bootstrap_exe_sha256!" || exit /B
 
 REM ----------------------------------------------------------------------------
 REM 7zip
@@ -72,17 +71,17 @@ set zip7_sha256=0b461f0a0eccfc4f39733a80d70fd1210fdd69f600fb6b657e03940a734e5fc1
 set zip7_exe_sha256=ed24ed04b5d4a20b3f50fc088a455195c756d7b5315d1965e8c569472b43d939
 set zip7_version=2107
 
-set zip7_zip=!downloads_dir!\win32_7zip_v!zip7_version!.exe
+set zip7_zip=!downloads_dir!\7zip_v!zip7_version!.exe
 set zip7_dir=!tools_dir!\7zip-!zip7_version!
 set zip7_exe=!zip7_dir!\7z.exe
 
 if not exist "!zip7_exe!" (
     call :DownloadFile "https://www.7-zip.org/a/7z!zip7_version!-x64.exe" "!zip7_zip!" || exit /B
-    call :VerifyFileSHA256 "!zip7_zip!" "!zip7_sha256!" || exit /B
+    call :FileHashCheck sha256 "!zip7_zip!" "!zip7_sha256!" || exit /B
     "!zip7_bootstrap_exe!" x -y -o"!zip7_dir!" !zip7_zip! || exit /B
 )
 
-call :VerifyFileSHA256 "!zip7_exe!" "!zip7_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!zip7_exe!" "!zip7_exe_sha256!" || exit /B
 
 REM Terminal
 echo set PATH=!zip7_dir!;%%PATH%%>> "!tmp_terminal_script!"
@@ -95,18 +94,18 @@ set gpg_w32_exe_sha256=ac181fb744df2950880458f8e18eb005de38e5c9858d13f0f772b5ae1
 set gpg_w32_version=2.3.6
 set gpg_w32_date=20220425
 
-set gpg_w32_zip=!downloads_dir!\win32_gpg_w32_v!gpg_w32_version!.exe
+set gpg_w32_zip=!downloads_dir!\gpg_w32_v!gpg_w32_version!.exe
 set gpg_w32_dir=!tools_dir!\gpg_w32-!gpg_w32_version!
 set gpg_w32_bin_dir=!gpg_w32_dir!\bin
 set gpg_w32_exe=!gpg_w32_bin_dir!\gpg.exe
 
 if not exist "!gpg_w32_exe!" (
     call :DownloadFile "https://gnupg.org/ftp/gcrypt/binary/gnupg-w32-!gpg_w32_version!_!gpg_w32_date!.exe" "!gpg_w32_zip!" || exit /B
-    call :VerifyFileSHA256 "!gpg_w32_zip!" "!gpg_w32_sha256!" || exit /B
+    call :FileHashCheck sha256 "!gpg_w32_zip!" "!gpg_w32_sha256!" || exit /B
     call :Unzip "!gpg_w32_zip!" "!gpg_w32_dir!" || exit /B
 )
 
-call :VerifyFileSHA256 "!gpg_w32_exe!" "!gpg_w32_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!gpg_w32_exe!" "!gpg_w32_exe_sha256!" || exit /B
 set PATH="!gpg_w32_bin_dir!";!PATH!
 
 REM Terminal
@@ -124,19 +123,19 @@ set wezterm_sha256=c634e98fa9715766bbb00cbc3c8a23d1d558c8cd5716ad2efca45ed4e0ef8
 set wezterm_exe_sha256=b9b5bae20d0679127ca0c4da276dff3b7b32310bfbfaede26a9b8ecb55e295ce
 set wezterm_version=20220408-101518-b908e2dd
 
-set wezterm_zip=!downloads_dir!\win32_wezterm-!wezterm_version!.zip
+set wezterm_zip=!downloads_dir!\wezterm-!wezterm_version!.zip
 set wezterm_dir=!tools_dir!\wezterm-!wezterm_version!
 set wezterm_exe=!wezterm_dir!\wezterm-gui.exe
 
 if not exist "!wezterm_exe!" (
     call :DownloadFile https://github.com/wez/wezterm/releases/download/!wezterm_version!/WezTerm-windows-!wezterm_version!.zip "!wezterm_zip!" || exit /B
-    call :VerifyFileSHA256 "!wezterm_zip!" "!wezterm_sha256!" || exit /B
+    call :FileHashCheck sha256 "!wezterm_zip!" "!wezterm_sha256!" || exit /B
     call :Unzip "!wezterm_zip!" "!wezterm_dir!" || exit /B
     call :Move "!wezterm_dir!\wezterm-windows-!wezterm_version!" "!wezterm_dir!" || exit /B
 )
 
-call :VerifyFileSHA256 "!wezterm_exe!" "!wezterm_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!wezterm_exe!" "!wezterm_exe_sha256!" || exit /B
-call :CopyAndAlwaysOverwriteFile "!install_dir!\wezterm.lua" "!wezterm_dir!\wezterm.lua" || exit /B
+call :CopyAndAlwaysOverwriteFile "!installer_dir!\os_wezterm.lua" "!wezterm_dir!\wezterm.lua" || exit /B
 
 REM ----------------------------------------------------------------------------
 REM Jetbrains Mono Font
@@ -151,11 +150,11 @@ set jetbrains_mono_file=!jetbrains_mono_dir!\fonts\ttf\JetBrainsMono-Regular.ttf
 
 if not exist "!jetbrains_mono_file!" (
     call :DownloadFile https://download.jetbrains.com/fonts/JetBrainsMono-!jetbrains_mono_version!.zip "!jetbrains_mono_zip!" || exit /B
-    call :VerifyFileSHA256 "!jetbrains_mono_zip!" "!jetbrains_mono_sha256!" || exit /B
+    call :FileHashCheck sha256 "!jetbrains_mono_zip!" "!jetbrains_mono_sha256!" || exit /B
     call :Unzip "!jetbrains_mono_zip!" "!jetbrains_mono_dir!" || exit /B
 )
 
-call :VerifyFileSHA256 "!jetbrains_mono_file!" "!jetbrains_mono_file_sha256!" || exit /B
+call :FileHashCheck sha256 "!jetbrains_mono_file!" "!jetbrains_mono_file_sha256!" || exit /B
 
 REM ----------------------------------------------------------------------------
 REM Programming
@@ -167,19 +166,20 @@ set cmake_sha256=9b509cc4eb7191dc128cfa3f2170036f9cbc7d9d5f93ff7fafc5b2d77b3b40d
 set cmake_exe_sha256=326ae6ce4bd46c27f6ce46c95b48efc19848fd9fc24d71d2e8a226dadfef810c
 set cmake_version=3.23.1
 
-set cmake_zip=!downloads_dir!\win32_cmake_!cmake_version!.zip
+set cmake_zip=!downloads_dir!\cmake_!cmake_version!.zip
 set cmake_dir=!tools_dir!\cmake-!cmake_version!
+set cmake_bin_dir=!cmake_dir!\bin
 set cmake_exe=!cmake_dir!\bin\cmake.exe
 
 if not exist "!cmake_exe!" (
     call :DownloadFile "https://github.com/Kitware/CMake/releases/download/v!cmake_version!/cmake-!cmake_version!-windows-x86_64.zip" "!cmake_zip!" || exit /B
-    call :VerifyFileSHA256 "!cmake_zip!" "!cmake_sha256!" || exit /B
+    call :FileHashCheck sha256 "!cmake_zip!" "!cmake_sha256!" || exit /B
     call :Unzip "!cmake_zip!" "!cmake_dir!" || exit /B
     call :Move "!cmake_dir!/cmake-!cmake_version!-windows-x86_64" "!cmake_dir!" || exit /B
 )
 
-call :VerifyFileSHA256 "!cmake_exe!" "!cmake_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!cmake_exe!" "!cmake_exe_sha256!" || exit /B
-call :MakeBatchShortcutInBinDir "cmake" "!cmake_exe!"
+echo set PATH=!cmake_bin_dir!;%%PATH%%>> "!tmp_terminal_script!"
 
 REM ----------------------------------------------------------------------------
 REM Git
@@ -188,7 +188,7 @@ set git_sha256=bc030848e282d49e562ae2392a72501cf539322ad06ffe4cea8cf766f148dfe8
 set git_exe_sha256=ae463cad04c2b15fc91de68ab096933ec08c44752e205aebd7d64c3a482df62d
 set git_version=2.33.0
 
-set git_zip=!downloads_dir!\win32_git_!git_version!.7z.exe
+set git_zip=!downloads_dir!\git_!git_version!.7z.exe
 REM Do *NOT* use an environment variable named git_dir as this will conflict
 REM with git reading it as the directory to base off all git operations.
 set git_install_dir=!tools_dir!\PortableGit-!git_version!
@@ -196,11 +196,11 @@ set git_exe=!git_install_dir!\cmd\git.exe
 
 if not exist "!git_exe!" (
     call :DownloadFile "https://github.com/git-for-windows/git/releases/download/v!git_version!.windows.2/PortableGit-!git_version!.2-64-bit.7z.exe" "!git_zip!" || exit /B
-    call :VerifyFileSHA256 "!git_zip!" "!git_sha256!" || exit /B
+    call :FileHashCheck sha256 "!git_zip!" "!git_sha256!" || exit /B
     call :Unzip "!git_zip!" "!git_install_dir!" || exit /B
 )
 
-call :VerifyFileSHA256 "!git_exe!" "!git_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!git_exe!" "!git_exe_sha256!" || exit /B
 
 REM Terminal
 echo set PATH=!git_install_dir!\cmd;%%PATH%%>> "!tmp_terminal_script!"
@@ -213,7 +213,7 @@ REM ----------------------------------------------------------------------------
 set llvm_exe_sha256=9f0748de7f946c210a030452de226986bab46a0121d7236ea0e7b5079cb6dfef
 set llvm_version=12.0.1
 
-set llvm_zip=!downloads_dir!\win32_llvm_x64_v!llvm_version!.exe
+set llvm_zip=!downloads_dir!\llvm_x64_v!llvm_version!.exe
 set llvm_dir=!tools_dir!\llvm-!llvm_version!
 set llvm_bin_dir=!llvm_dir!\bin
 set llvm_exe=!llvm_bin_dir!\clang.exe
@@ -231,13 +231,13 @@ if not exist "!llvm_exe!" (
     call :Unzip "!llvm_zip!" "!llvm_dir!" || exit /B
 )
 
-call :VerifyFileSHA256 "!llvm_exe!" "!llvm_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!llvm_exe!" "!llvm_exe_sha256!" || exit /B
 
 REM Clang Format
 set clang_format_py_sha256=36ba7aa047f8a8ac8fdc278aaa733de801cc84dea60a4210973fd3e4f0d2a330
 set vim_clang_format=!vim_dir!\clang-format.py
 call :CopyAndAlwaysOverwriteFile "!llvm_dir!\share\clang\clang-format.py" "!vim_clang_format!" || exit /B
-call :VerifyFileSHA256 "!vim_clang_format!" "!clang_format_py_sha256!" || exit /B
+call :FileHashCheck sha256 "!vim_clang_format!" "!clang_format_py_sha256!" || exit /B
 
 REM Terminal
 echo set PATH=!llvm_bin_dir!;%%PATH%%>> "!tmp_terminal_script!"
@@ -249,19 +249,19 @@ set mingw_sha256=853970527b5de4a55ec8ca4d3fd732c00ae1c69974cc930c82604396d43e79f
 set mingw_exe_sha256=c5f0953f7a71ddcdf0852e1e44a43cef9b8fe121beba4d4202bfe6d405de47c0
 set mingw_version=8.1.0
 
-set mingw_zip=!downloads_dir!\win32_mingw64-posix-seg-rt_v6-rev0!mingw_version!.7z
+set mingw_zip=!downloads_dir!\mingw64-posix-seg-rt_v6-rev0!mingw_version!.7z
 set mingw_dir=!tools_dir!\mingw64-posix-seh-rt_v6-rev0-!mingw_version!
 set mingw_bin_dir=!mingw_dir!\bin
 set mingw_exe=!mingw_bin_dir!\gcc.exe
 
 if not exist "!mingw_exe!" (
-    call :DownloadFile \"https://sourceforge.net/projects/mingw-w64/files/Toolchains targetting Win64/Personal Builds/mingw-builds/!mingw_version!/threads-posix/seh/x86_64-!mingw_version!-release-posix-seh-rt_v6-rev0.7z\" !mingw_zip! || exit /B
+    call :DownloadFile "https://sourceforge.net/projects/mingw-w64/files/Toolchains targetting Win64/Personal Builds/mingw-builds/!mingw_version!/threads-posix/seh/x86_64-!mingw_version!-release-posix-seh-rt_v6-rev0.7z" !mingw_zip! || exit /B
-    call :VerifyFileSHA256 !mingw_zip! !mingw_sha256! || exit /B
+    call :FileHashCheck sha256 !mingw_zip! !mingw_sha256! || exit /B
     call :Unzip !mingw_zip! !mingw_dir! || exit /B
     call :Move !mingw_dir!\mingw64 !mingw_dir! || exit /B
 )
 
-call :VerifyFileSHA256 "!mingw_exe!" "!mingw_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!mingw_exe!" "!mingw_exe_sha256!" || exit /B
 
 REM Terminal
 echo set PATH=!mingw_bin_dir!;%%PATH%%>> "!tmp_terminal_script!"
@@ -279,11 +279,11 @@ set ninja_exe=!ninja_dir!\ninja.exe
 
 if not exist "!ninja_exe!" (
     call :DownloadFile "https://github.com/ninja-build/ninja/releases/download/v!ninja_version!/ninja-win.zip" "!ninja_zip!" || exit /B
-    call :VerifyFileSHA256 "!ninja_zip!" "!ninja_sha256!" || exit /B
+    call :FileHashCheck sha256 "!ninja_zip!" "!ninja_sha256!" || exit /B
     call :Unzip "!ninja_zip!" "!ninja_dir!" || exit /B
 )
 
-call :VerifyFileSHA256 "!ninja_exe!" "!ninja_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!ninja_exe!" "!ninja_exe_sha256!" || exit /B
 call :MakeBatchShortcutInBinDir "ninja" "!ninja_exe!"
 
 REM ----------------------------------------------------------------------------
@@ -299,12 +299,12 @@ set nodejs_exe=!nodejs_dir!\node.exe
 
 if not exist "!nodejs_exe!" (
     call :DownloadFile "https://nodejs.org/dist/v!nodejs_version!/node-v!nodejs_version!-win-x64.7z" "!nodejs_zip!" || exit /B
-    call :VerifyFileSHA256 "!nodejs_zip!" "!nodejs_sha256!" || exit /B
+    call :FileHashCheck sha256 "!nodejs_zip!" "!nodejs_sha256!" || exit /B
     call :Unzip "!nodejs_zip!" "!nodejs_dir!" || exit /B
     call :Move "!nodejs_dir!\node-v!nodejs_version!-win-x64" "!nodejs_dir!" || exit /B
 )
 
-call :VerifyFileSHA256 "!nodejs_exe!" "!nodejs_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!nodejs_exe!" "!nodejs_exe_sha256!" || exit /B
 
 REM Terminal
 echo set PATH=!nodejs_dir!;%%PATH%%>> "!tmp_terminal_script!"
@@ -318,18 +318,18 @@ set python_version=3.9.0.2dot
 set python_version_nodot=3902
 set python_version_dot=3.9.0
 
-set python_zip=!downloads_dir!\win32_Winpython64-!python_version!.zip
+set python_zip=!downloads_dir!\Winpython64-!python_version!.zip
 set python_dir=!tools_dir!\Winpython64-!python_version_nodot!
 set python_exe=!python_dir!\python-3.9.0.amd64\python.exe
 
 if not exist "!python_exe!" (
     call :DownloadFile "https://github.com/winpython/winpython/releases/download/3.0.20201028/Winpython64-!python_version!.exe" "!python_zip!" || exit /B
-    call :VerifyFileSHA256 "!python_zip!" "!python_sha256!" || exit /B
+    call :FileHashCheck sha256 "!python_zip!" "!python_sha256!" || exit /B
     call :Unzip "!python_zip!" "!python_dir!" || exit /B
     call :Move "!python_dir!\WPy64-!python_version_nodot!" "!python_dir!" || exit /B
 )
 
-call :VerifyFileSHA256 "!python_exe!" "!python_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!python_exe!" "!python_exe_sha256!" || exit /B
 
 set python_bin_dir=!python_dir!\python-!python_version_dot!.amd64
 set python_scripts_bin_dir=!python_bin_dir!\Scripts
@@ -346,18 +346,18 @@ set renderdoc_sha256=ed1c1228b8fc30e53d3560dbae9d7bf47b85e0e15e30e6f3e4f36173a74
 set renderdoc_exe_sha256=3b4874f1677f08e4c329696eaa8281b7ee86b16ad5679932a72085a3e7abc658
 set renderdoc_version=1.19
 
-set renderdoc_zip=!downloads_dir!\win32_renderdoc-!renderdoc_version!.zip
+set renderdoc_zip=!downloads_dir!\renderdoc-!renderdoc_version!.zip
 set renderdoc_dir=!tools_dir!\renderdoc-x64-!renderdoc_version!
 set renderdoc_exe=!renderdoc_dir!\qrenderdoc.exe
 
 if not exist "!renderdoc_exe!" (
     call :DownloadFile "https://renderdoc.org/stable/!renderdoc_version!/RenderDoc_!renderdoc_version!_64.zip" "!renderdoc_zip!" || exit /B
-    call :VerifyFileSHA256 "!renderdoc_zip!" "!renderdoc_sha256!" || exit /B
+    call :FileHashCheck sha256 "!renderdoc_zip!" "!renderdoc_sha256!" || exit /B
     call :Unzip "!renderdoc_zip!" "!renderdoc_dir!" || exit /B
     call :Move "!renderdoc_dir!\RenderDoc_!renderdoc_version!_64" "!renderdoc_dir!" || exit /B
 )
 
-call :VerifyFileSHA256 "!renderdoc_exe!" "!renderdoc_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!renderdoc_exe!" "!renderdoc_exe_sha256!" || exit /B
 
 REM ----------------------------------------------------------------------------
 REM Zeal
@@ -366,18 +366,18 @@ set zeal_sha256=08e9992f620ba0a5ea348471d8ac9c85059e95eedd950118928be639746e3f94
 set zeal_exe_sha256=d1e687a33e117b6319210f40e2401b4a68ffeb0f33ef82f5fb6a31ce4514a423
 set zeal_version=0.6.1
 
-set zeal_zip=!downloads_dir!\win32_zeal-!zeal_version!.7z
+set zeal_zip=!downloads_dir!\zeal-!zeal_version!.7z
 set zeal_dir=!tools_dir!\zeal-x64-!zeal_version!
 set zeal_exe=!zeal_dir!\zeal.exe
 
 if not exist "!zeal_exe!" (
     call :DownloadFile "https://github.com/zealdocs/zeal/releases/download/v!zeal_version!/zeal-portable-!zeal_version!-windows-x64.7z" "!zeal_zip!" || exit /B
-    call :VerifyFileSHA256 "!zeal_zip!" "!zeal_sha256!" || exit /B
+    call :FileHashCheck sha256 "!zeal_zip!" "!zeal_sha256!" || exit /B
     call :Unzip "!zeal_zip!" "!zeal_dir!" || exit /B
     call :Move "!zeal_dir!\zeal-portable-!zeal_version!-windows-x64" "!zeal_dir!" || exit /B
 )
 
-call :VerifyFileSHA256 "!zeal_exe!" "!zeal_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!zeal_exe!" "!zeal_exe_sha256!" || exit /B
 
 REM ----------------------------------------------------------------------------
 REM Zig
@@ -387,17 +387,17 @@ set zig_exe_sha256=63c2f819cfdb1a35cb954791fc0aa48910a42065a5e1c6ff89ee16775c75a
 set zig_version=0.9.1
 
 set zig_file=zig-windows-x86_64-!zig_version!.zip
-set zig_zip=!downloads_dir!\win32_!zig_file!
+set zig_zip=!downloads_dir!\!zig_file!
 set zig_dir=!tools_dir!\zig-windows-x86_64-!zig_version!
 set zig_exe=!zig_dir!\zig.exe
 
 if not exist "!zig_exe!" (
     call :DownloadFile "https://ziglang.org/download/!zig_version!/!zig_file!" "!zig_zip!" || exit /B
-    call :VerifyFileSHA256 "!zig_zip!" "!zig_sha256!" || exit /B
+    call :FileHashCheck sha256 "!zig_zip!" "!zig_sha256!" || exit /B
     call :Unzip "!zig_zip!" "!zig_dir!" || exit /B
 )
 
-call :VerifyFileSHA256 "!zig_exe!" "!zig_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!zig_exe!" "!zig_exe_sha256!" || exit /B
 call :MakeBatchShortcutInBinDir "zig" "!zig_exe!"
 
 REM ----------------------------------------------------------------------------
@@ -467,21 +467,21 @@ set clink_exe_sha256=38b1bb5a8392ac8d7f98d3dcc0a41dc7fc31344800d4facd83e10d9175d
 set clink_version=1.3.13
 set clink_git_hash=24b02e
 
-set clink_zip=!downloads_dir!\win32_clink_!clink_version!.zip
+set clink_zip=!downloads_dir!\clink_!clink_version!.zip
 set clink_dir=!tools_dir!\clink-!clink_version!
 set clink_exe=!clink_dir!\clink_x64.exe
 set clink_bat=!clink_dir!\clink.bat
 
 if not exist "!clink_exe!" (
     call :DownloadFile "https://github.com/chrisant996/clink/releases/download/v!clink_version!/clink.!clink_version!.!clink_git_hash!.zip" "!clink_zip!" || exit /B
-    call :VerifyFileSHA256 "!clink_zip!" "!clink_sha256!" || exit /B
+    call :FileHashCheck sha256 "!clink_zip!" "!clink_sha256!" || exit /B
     call :Unzip "!clink_zip!" "!clink_dir!" || exit /B
     call :Move "!clink_dir!\clink_!clink_version!" "!clink_dir!" || exit /B
     call :CopyAndAlwaysOverwriteFile "!clink_dir!\_default_inputrc" "!clink_dir!\default_inputrc" || exit /B
     call :CopyAndAlwaysOverwriteFile "!clink_dir!\_default_settings" "!clink_dir!\default_settings" || exit /B
 )
 
-call :VerifyFileSHA256 "!clink_exe!" "!clink_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!clink_exe!" "!clink_exe_sha256!" || exit /B
 call :MakeBatchShortcutInBinDir "clink" "!clink_bat!"
 
 REM Clink Completion Addon
@@ -502,17 +502,17 @@ set dependencies_sha256=7d22dc00f1c09fd4415d48ad74d1cf801893e83b9a39944b0fce6dea
 set dependencies_exe_sha256=1737e5406128c3560bbb2bced3ac62d77998e592444f94b10cc0aa0bb1e617e6
 set dependencies_version=v1.11.1
 
-set dependencies_zip=!downloads_dir!\win32_dependencies_!dependencies_version!.zip
+set dependencies_zip=!downloads_dir!\dependencies_!dependencies_version!.zip
 set dependencies_dir=!tools_dir!\dependencies-!dependencies_version!
 set dependencies_exe=!dependencies_dir!\DependenciesGui.exe
 
 if not exist "!dependencies_exe!" (
     call :DownloadFile "https://github.com/lucasg/Dependencies/releases/download/!dependencies_version!/Dependencies_x64_Release.zip" "!dependencies_zip!" || exit /B
-    call :VerifyFileSHA256 "!dependencies_zip!" "!dependencies_sha256!" || exit /B
+    call :FileHashCheck sha256 "!dependencies_zip!" "!dependencies_sha256!" || exit /B
     call :Unzip "!dependencies_zip!" "!dependencies_dir!" || exit /B
 )
 
-call :VerifyFileSHA256 "!dependencies_exe!" "!dependencies_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!dependencies_exe!" "!dependencies_exe_sha256!" || exit /B
 
 REM ----------------------------------------------------------------------------
 REM everything (void tools search program)
@@ -521,17 +521,17 @@ set everything_sha256=656ff3946222048a5558160023da6fd8abc6fa9569f7ac1dff058410a3
 set everything_exe_sha256=8f853443c0b0e8c144315a27d1e8bf1595bd09cb364393226accfe105c0a2c85
 set everything_version=1.4.1.1015
 
-set everything_zip=!downloads_dir!\win32_everything_v!everything_version!.zip
+set everything_zip=!downloads_dir!\everything_v!everything_version!.zip
 set everything_dir=!tools_dir!\everything-!everything_version!
 set everything_exe=!everything_dir!\everything.exe
 
 if not exist "!everything_exe!" (
     call :DownloadFile "https://www.voidtools.com/Everything-!everything_version!.x64.zip" "!everything_zip!" || exit /B
-    call :VerifyFileSHA256 "!everything_zip!" "!everything_sha256!" || exit /B
+    call :FileHashCheck sha256 "!everything_zip!" "!everything_sha256!" || exit /B
     call :Unzip "!everything_zip!" "!everything_dir!" || exit /B
 )
 
-call :VerifyFileSHA256 "!everything_exe!" "!everything_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!everything_exe!" "!everything_exe_sha256!" || exit /B
 
 REM ----------------------------------------------------------------------------
 REM fzf
@@ -540,17 +540,18 @@ set fzf_sha256=f0797ceee089017108c80b09086c71b8eec43d4af11ce939b78b1d5cfd202540
 set fzf_exe_sha256=5176c4c90957aa7e3d12f91b8ba55acac7524a83998517119ee19b61f4534140
 set fzf_version=0.29.0
 
-set fzf_zip=!downloads_dir!\win32_fzf_v!fzf_version!.zip
+set fzf_zip=!downloads_dir!\fzf_v!fzf_version!.zip
-set fzf_dir=!bin_dir!
+set fzf_dir=!tools_dir!\fzf-!fzf_version!
 set fzf_exe=!fzf_dir!\fzf.exe
 
-if not exist "!fzf_exe!-!fzf_version!.sha256.txt" (
+if not exist "!fzf_exe!" (
     call :DownloadFile "https://github.com/junegunn/fzf/releases/download/!fzf_version!/fzf-!fzf_version!-windows_amd64.zip" "!fzf_zip!" || exit /B
-    call :VerifyFileSHA256 "!fzf_zip!" "!fzf_sha256!" || exit /B
+    call :FileHashCheck sha256 "!fzf_zip!" "!fzf_sha256!" || exit /B
-    call :UnzipAndAlwaysOverwrite "!fzf_zip!" "!fzf_dir!" || exit /B
+    call :Unzip "!fzf_zip!" "!fzf_dir!" || exit /B
 )
 
-call :VerifyFileSHA256 "!fzf_exe!" "!fzf_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!fzf_exe!" "!fzf_exe_sha256!" || exit /B
+call :MakeBatchShortcutInBinDir "fzf" "!fzf_exe!"
 
 REM Terminal
 REM Use RG for FZF to make it ultra fast
@@ -560,20 +561,20 @@ echo set FZF_DEFAULT_COMMAND=rg --files --no-ignore-vcs --hidden>> "!tmp_termina
 REM ----------------------------------------------------------------------------
 REM GVim, Vim Plug, Vim Config
 REM ----------------------------------------------------------------------------
-set gvim_zip=!downloads_dir!\win32_gvim_x64.7z
+set gvim_zip=!downloads_dir!\gvim_x64.7z
 set gvim_dir=!tools_dir!\GVim
 if not exist "!gvim_dir!\gvim.exe" (
     call :DownloadFile https://tuxproject.de/projects/vim/complete-x64.7z !gvim_zip! || exit /B
     call :Unzip "!gvim_zip!" "!gvim_dir!" || exit /B
 )
 
-call :CopyAndAlwaysOverwriteFile "!install_dir!\_vimrc" !home_dir!
+call :CopyAndAlwaysOverwriteFile "!installer_dir!\os_vimrc" "!home_dir!\_vimrc"
 
 REM DLL that hooks into GVIM and provides fullscreen with F11
 set gvim_fullscreen_dll_sha256=1c83747b67ed73c05d44c1af8222a860bc5a48b56bf54cd6e21465a2deb78456
 set gvim_fullscreen_dll=!gvim_dir!\gvim_fullscreen.dll
-call :CopyAndAlwaysOverwriteFile "!install_dir!\win32_gvim_fullscreen.dll" "!gvim_fullscreen_dll!" || exit /B
+call :CopyAndAlwaysOverwriteFile "!installer_dir!\win_gvim_fullscreen.dll" "!gvim_fullscreen_dll!" || exit /B
-call :VerifyFileSHA256 "!gvim_fullscreen_dll!" "!gvim_fullscreen_dll_sha256!" || exit /B
+call :FileHashCheck sha256 "!gvim_fullscreen_dll!" "!gvim_fullscreen_dll_sha256!" || exit /B
 
 set vim_plug_dir=!vim_dir!\autoload
 set vim_plug=!vim_plug_dir!\plug.vim
@@ -590,17 +591,17 @@ set imhex_sha256=080f537d3ea58c002cc2112adbec1352144710b43764de9a1dc04f129d3a334
 set imhex_exe_sha256=6a4b0e70bf7c78af074af0de2346164d9f5aec28ea224f9ee903412e1c774d95
 set imhex_version=1.17.0
 
-set imhex_zip=!downloads_dir!\win32_imhex_v!imhex_version!.zip
+set imhex_zip=!downloads_dir!\imhex_v!imhex_version!.zip
-set imhex_dir=!tools_dir!\imhex-x64-x!imhex_version!
+set imhex_dir=!tools_dir!\imhex-!imhex_version!
 set imhex_exe=!imhex_dir!\imhex.exe
 
-if not exist "!imhex_exe!-!imhex_version!.sha256.txt" (
+if not exist "!imhex_exe!" (
     call :DownloadFile "https://github.com/WerWolv/ImHex/releases/download/v!imhex_version!/Windows.Portable.ZIP.zip" "!imhex_zip!" || exit /B
-    call :VerifyFileSHA256 "!imhex_zip!" "!imhex_sha256!" || exit /B
+    call :FileHashCheck sha256 "!imhex_zip!" "!imhex_sha256!" || exit /B
-    call :UnzipAndAlwaysOverwrite "!imhex_zip!" "!imhex_dir!" || exit /B
+    call :Unzip "!imhex_zip!" "!imhex_dir!" || exit /B
 )
 
-call :VerifyFileSHA256 "!imhex_exe!" "!imhex_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!imhex_exe!" "!imhex_exe_sha256!" || exit /B
 
 REM ----------------------------------------------------------------------------
 REM Joplin
@@ -616,7 +617,7 @@ if not exist "!joplin_exe!" (
     call :DownloadFile "https://github.com/laurent22/joplin/releases/download/v!joplin_version!/JoplinPortable.exe" "!joplin_exe!" || exit /B
 )
 
-call :VerifyFileSHA256 "!joplin_exe!" "!joplin_sha256!" || exit /B
+call :FileHashCheck sha256 "!joplin_exe!" "!joplin_sha256!" || exit /B
 
 REM ----------------------------------------------------------------------------
 REM Keypirinha
@@ -625,18 +626,18 @@ set keypirinha_sha256=d109a16e6a5cf311abf6d06bbe5b1be3b9ba323b79c32a168628189e10
 set keypirinha_exe_sha256=2d3adb36a04e9fdf94636c9ac5d4c2b754accbfaecd81f4ee7189c3c0edc8af1
 set keypirinha_version=2.26
 
-set keypirinha_zip=!downloads_dir!\win32_keypirinha-x64-!keypirinha_version!.7z
+set keypirinha_zip=!downloads_dir!\keypirinha-x64-!keypirinha_version!.7z
 set keypirinha_dir=!tools_dir!\keypirinha-x64-!keypirinha_version!
 set keypirinha_exe=!keypirinha_dir!\keypirinha.exe
 
 if not exist "!keypirinha_exe!" (
     call :DownloadFile "https://github.com/Keypirinha/Keypirinha/releases/download/v!keypirinha_version!/keypirinha-!keypirinha_version!-x64-portable.7z" "!keypirinha_zip!" || exit /B
-    call :VerifyFileSHA256 "!keypirinha_zip!" "!keypirinha_sha256!" || exit /B
+    call :FileHashCheck sha256 "!keypirinha_zip!" "!keypirinha_sha256!" || exit /B
     call :Unzip "!keypirinha_zip!" "!keypirinha_dir!" || exit /B
     call :Move "!keypirinha_dir!\keypirinha" "!keypirinha_dir!" || exit /B
 )
 
-call :VerifyFileSHA256 "!keypirinha_exe!" "!keypirinha_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!keypirinha_exe!" "!keypirinha_exe_sha256!" || exit /B
 
 REM ----------------------------------------------------------------------------
 REM Misc Tools
@@ -644,10 +645,10 @@ REM ----------------------------------------------------------------------------
 REM ctags: C/C++ code annotation generator
 REM scanmapset: Bind capslock to escape via registry
 REM uncap: Bind capslock to escape via run-time program
-call :CopyAndAlwaysOverwriteFile "!install_dir!\win32_ctags.exe" "!bin_dir!\ctags.exe" || exit /B
+call :CopyAndAlwaysOverwriteFile "!installer_dir!\win_ctags.exe"              "!bin_dir!\ctags.exe" || exit /B
-call :CopyAndAlwaysOverwriteFile "!install_dir!\win32_scanmapset.exe" "!bin_dir!\scanmapset.exe" || exit /B
+call :CopyAndAlwaysOverwriteFile "!installer_dir!\win_scanmapset.exe"         "!bin_dir!\scanmapset.exe" || exit /B
-call :CopyAndAlwaysOverwriteFile "!install_dir!\win32_uncap.exe" "!bin_dir!\uncap.exe" || exit /B
+call :CopyAndAlwaysOverwriteFile "!installer_dir!\win_uncap.exe"              "!bin_dir!\uncap.exe" || exit /B
-call :CopyAndAlwaysOverwriteFile "!install_dir!\clang_format_style_file" "!home_dir!\_clang-format" || exit /B
+call :CopyAndAlwaysOverwriteFile "!installer_dir!\os_clang_format_style_file" "!home_dir!\_clang-format" || exit /B
 
 REM ------------------------------------------------------------------------
 REM MobaXTerm
@@ -656,17 +657,17 @@ set mobaxterm_sha256=91f80537f12c2ad34a5eba99a285c149781c6d35a144a965ce3aea8a9bc
 set mobaxterm_exe_sha256=1053c81b44018d6e6519a9c80d7413f7bb36e9f6e43b3da619b2229aa362a522
 set mobaxterm_version=21.2
 
-set mobaxterm_zip=!downloads_dir!\win32_mobaxterm-!mobaxterm_version!.zip
+set mobaxterm_zip=!downloads_dir!\mobaxterm-!mobaxterm_version!.zip
 set mobaxterm_dir=!tools_dir!\mobaxterm-!mobaxterm_version!
 set mobaxterm_exe=!mobaxterm_dir!\MobaXterm_Personal_21.2.exe
 
 if not exist "!mobaxterm_exe!" (
     call :DownloadFile "https://download.mobatek.net/2122021051924233/MobaXterm_Portable_v!mobaxterm_version!.zip" !mobaxterm_zip! || exit /B
-    call :VerifyFileSHA256 !mobaxterm_zip! !mobaxterm_sha256! || exit /B
+    call :FileHashCheck sha256 !mobaxterm_zip! !mobaxterm_sha256! || exit /B
     call :Unzip !mobaxterm_zip! !mobaxterm_dir! || exit /B
 )
 
-call :VerifyFileSHA256 "!mobaxterm_exe!" "!mobaxterm_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!mobaxterm_exe!" "!mobaxterm_exe_sha256!" || exit /B
 
 REM ----------------------------------------------------------------------------
 REM O&O ShutUp10 (Privacy Tool for Windows)
@@ -690,17 +691,17 @@ set process_hacker_sha256=c662b756324c9727760b4e921459d31a30f99cf8d3f24b64f4fcb3
 set process_hacker_exe_sha256=22b1b8f080a41a07f23eae8ab0ad2e5f88d3c5af5d8c1cd1bb4f6856482e945c
 set process_hacker_version=3.0.4861
 
-set process_hacker_zip=!downloads_dir!\win32_process_hacker-!process_hacker_version!.zip
+set process_hacker_zip=!downloads_dir!\process_hacker-!process_hacker_version!.zip
 set process_hacker_dir=!tools_dir!\process_hacker-!process_hacker_version!
 set process_hacker_exe=!process_hacker_dir!\64bit\ProcessHacker.exe
 
 if not exist "!process_hacker_exe!" (
     call :DownloadFile "https://github.com/ProcessHackerRepoTool/nightly-builds-mirror/releases/download/v!process_hacker_version!/processhacker-!process_hacker_version!-bin.zip" "!process_hacker_zip!" || exit /B
-    call :VerifyFileSHA256 "!process_hacker_zip!" "!process_hacker_sha256!" || exit /B
+    call :FileHashCheck sha256 "!process_hacker_zip!" "!process_hacker_sha256!" || exit /B
     call :Unzip "!process_hacker_zip!" "!process_hacker_dir!" || exit /B
 )
 
-call :VerifyFileSHA256 "!process_hacker_exe!" "!process_hacker_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!process_hacker_exe!" "!process_hacker_exe_sha256!" || exit /B
 
 REM ----------------------------------------------------------------------------
 REM ripgrep
@@ -709,18 +710,18 @@ set rg_sha256=a47ace6f654c5ffa236792fc3ee3fefd9c7e88e026928b44da801acb72124aa8
 set rg_exe_sha256=ab5595a4f7a6b918cece0e7e22ebc883ead6163948571419a1dd5cd3c7f37972
 set rg_version=13.0.0
 
-set rg_zip=!downloads_dir!\win32_rg_v!rg_version!.zip
+set rg_zip=!downloads_dir!\rg_v!rg_version!.zip
 set rg_dir=!tools_dir!\ripgrep-!rg_version!
 set rg_exe=!rg_dir!\rg.exe
 
 if not exist "!rg_exe!" (
     call :DownloadFile "https://github.com/BurntSushi/ripgrep/releases/download/!rg_version!/ripgrep-!rg_version!-x86_64-pc-windows-msvc.zip" "!rg_zip!" || exit /B
-    call :VerifyFileSHA256 "!rg_zip!" "!rg_sha256!" || exit /B
+    call :FileHashCheck sha256 "!rg_zip!" "!rg_sha256!" || exit /B
     call :Unzip "!rg_zip!" "!rg_dir!" || exit /B
     call :Move "!rg_dir!\ripgrep-!rg_version!-x86_64-pc-windows-msvc" "!rg_dir!" || exit /B
 )
 
-call :VerifyFileSHA256 "!rg_exe!" "!rg_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!rg_exe!" "!rg_exe_sha256!" || exit /B
 call :MakeBatchShortcutInBinDir "rg" "!rg_exe!"
 
 REM ----------------------------------------------------------------------------
@@ -733,7 +734,7 @@ set geth_md5=753cab189bd175d9fc6fea965ff7161b
 set geth_exe_sha256=7374e1c761f27a24a1d66299935b03b46ac354b6dc5f48505178d014a56f12df
 set geth_version=1.10.17-25c9b49f
 
-set geth_zip=!downloads_dir!\win32_geth-amd64-v!geth_version!.zip
+set geth_zip=!downloads_dir!\geth-amd64-v!geth_version!.zip
 set geth_dir=!tools_dir!\geth-windows-amd64-!geth_version!
 set geth_exe=!geth_dir!\geth.exe
 
@@ -743,14 +744,14 @@ set geth_gpg_sig=!geth_zip!.asc
 if not exist "!geth_exe!" (
     call :DownloadFile "https://gethstore.blob.core.windows.net/builds/geth-windows-amd64-!geth_version!.zip" "!geth_zip!" || exit /B
     call :DownloadFile "https://gethstore.blob.core.windows.net/builds/geth-windows-amd64-!geth_version!.zip.asc" "!geth_gpg_sig! || exit /B
-    call :VerifyFileMD5 "!geth_zip!" "!geth_version!" "!geth_md5!" || exit /B
+    call :FileHashCheck md5 "!geth_zip!" "!geth_md5!" || exit /B
 
     gpg --import "!geth_gpg_key!" || exit /B
     gpg --verify "!geth_gpg_sig!" "!geth_zip!" || exit /B
     call :Unzip "!geth_zip!" "!geth_dir!" || exit /B
 )
 
-call :VerifyFileSHA256 "!geth_exe!" "!geth_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!geth_exe!" "!geth_exe_sha256!" || exit /B
 call :MakeBatchShortcutInBinDir "geth" "!geth_exe!"
 
 REM ----------------------------------------------------------------------------
@@ -760,17 +761,17 @@ set remix_ide_sha256=19a56cb79459e612d8cbdd6b6729d06c7080d983537d2494a15fd25ea67
 set remix_ide_exe_sha256=960bc454e37a718b86018b596d14ed977d1a8e1a5bc57b5afd573fc5e9b84a47
 set remix_ide_version=1.3.1
 
-set remix_ide_zip=!downloads_dir!\win32_remix-ide-amd64-v!remix_ide_version!.zip
+set remix_ide_zip=!downloads_dir!\remix-ide-amd64-v!remix_ide_version!.zip
 set remix_ide_dir=!tools_dir!\remix-ide-!remix_ide_version!
 set remix_ide_exe=!remix_ide_dir!\Remix IDE.exe
 
 if not exist "!remix_ide_exe!" (
     call :DownloadFile "https://github.com/ethereum/remix-desktop/releases/download/v!remix_ide_version!/Remix-IDE-!remix_ide_version!-win.zip" "!remix_ide_zip!" || exit /B
-    call :VerifyFileSHA256 "!remix_ide_zip!" "!remix_ide_sha256!" || exit /B
+    call :FileHashCheck sha256 "!remix_ide_zip!" "!remix_ide_sha256!" || exit /B
     call :Unzip "!remix_ide_zip!" "!remix_ide_dir!" || exit /B
 )
 
-call :VerifyFileSHA256 "!remix_ide_exe!" "!remix_ide_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!remix_ide_exe!" "!remix_ide_exe_sha256!" || exit /B
 
 REM ----------------------------------------------------------------------------
 REM solidity
@@ -786,13 +787,13 @@ if not exist "!solidity_exe!" (
     call :DownloadFile "https://binaries.soliditylang.org/windows-amd64/solc-windows-amd64-v!solidity_version!.exe" "!solidity_exe!" || exit /B
 )
 
-call :VerifyFileSHA256 "!solidity_exe!" "!solidity_exe_sha256!" || exit /B
+call :FileHashCheck sha256 "!solidity_exe!" "!solidity_exe_sha256!" || exit /B
 call :MakeBatchShortcutInBinDir "solc" "!solidity_exe!"
 
 REM ----------------------------------------------------------------------------
 REM Finish Terminal Script
 REM ----------------------------------------------------------------------------
-echo if exist "!root_dir!win32_terminal_user_config.bat" call "!root_dir!win32_terminal_user_config.bat">> "!tmp_terminal_script!"
+echo if exist "!tools_dir!\win_terminal_user_config.bat" call "!tools_dir!\win_terminal_user_config.bat">> "!tmp_terminal_script!"
 echo start "" /MAX "!wezterm_exe!">> "!tmp_terminal_script!"
 echo exit>> "!tmp_terminal_script!"
 move /Y !tmp_terminal_script! !terminal_script!
@@ -803,8 +804,8 @@ REM ----------------------------------------------------------------------------
 REM Odin uses J. Blow's Microsoft craziness SDK locator which relies on the
 REM registry. Here we inject the registry entry that the SDK locator checks for
 REM finding our portable MSVC installation.
-set odin_install_workaround_script=!root_dir!\win32_install_odin_msvc_workaround.reg
+set odin_install_workaround_script=!tools_dir!\win_install_odin_msvc_workaround.reg
-set odin_uninstall_workaround_script=!root_dir!\win32_uninstall_odin_msvc_workaround.reg
+set odin_uninstall_workaround_script=!tools_dir!\win_uninstall_odin_msvc_workaround.reg
 
 set kits_root_10=%msvc_dir%\Windows Kits\10\
 set kits_root_10=%kits_root_10:\=\\%
@@ -822,7 +823,7 @@ echo "KitsRoot10"=->>!odin_uninstall_workaround_script!
 REM ----------------------------------------------------------------------------
 REM Background Application Scripts
 REM ----------------------------------------------------------------------------
-set bg_app_script=!root_dir!\win32_start_background_apps.bat
+set bg_app_script=!tools_dir!\win_start_background_apps.bat
 echo @echo off> "!bg_app_script!"
 echo start "" "!everything_dir!\everything.exe">> "!bg_app_script!"
 echo start "" "!keypirinha_dir!\keypirinha.exe">> "!bg_app_script!"
@@ -834,7 +835,10 @@ set ctags_file=!bin_dir!\ctags_cpp.bat
 echo @echo off> "!ctags_file!"
 echo ctags --c++-kinds=+p --fields=+iaS --extras=+q %%*>> !ctags_file!
 
-echo - Setup complete. Launch !root_dir!win32_terminal.bat [or restart Wezterm instance if you're updating an existing installation]
+REM ----------------------------------------------------------------------------
+REM Finish
+REM ----------------------------------------------------------------------------
+echo - Setup complete. Launch !tools_dir!\win_terminal.bat [or restart Wezterm instance if you're updating an existing installation]
 echo - (Optional) A custom font is provided and requires manual intallation in Windows at !jetbrains_mono_file!
 echo              This font will be used in GVIM if it's available.
 pause
@@ -852,7 +856,7 @@ if exist !dest_file! (
     echo - [Cached] !msg!
 ) else (
     echo - !msg!
-    call powershell -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest !url! -OutFile !dest_file! -UserAgent [Microsoft.PowerShell.Commands.PSUserAgent]::FireFox"
+    call powershell -NoLogo -NoProfile -NonInteractive -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest !url! -OutFile !dest_file! -UserAgent [Microsoft.PowerShell.Commands.PSUserAgent]::FireFox"
 )
 
 if not exist !dest_file! echo [Download File] Failed to download file from !url!
@@ -883,57 +887,23 @@ if exist !dest! (
 exit /B !ERRORLEVEL!
 
 REM ------------------------------------------------------------------------------------------------
-:UnzipAndAlwaysOverwrite
+:FileHashCheck
-set zip_file=%~1
+set algorithm=%~1
-set dest=%~2
+set file=%~2
-set msg=[Unzip] !zip_file! to !dest!
+set expected=%~3
-
-echo - !msg!
-call !zip7_dir!\7z.exe x -y -spe -o!dest! !zip_file!
-exit /B !ERRORLEVEL!
-
-REM ------------------------------------------------------------------------------------------------
-:VerifyFileSHA256
-set file=%~1
-set expected_sha256=%~2
 
 REM Calculate hash
-set calculated_sha256_file=!file!.sha256.txt
+for /F "tokens=2 delims= " %%c in ('powershell -NoLogo -NoProfile -NonInteractive Get-FileHash -algorithm !algorithm! \"!file!\" ') do ( set "actual=%%c" )
-call powershell "$FileHash = Get-FileHash -algorithm sha256 \"!file!\"; $FileHash.Hash.ToLower()" > !calculated_sha256_file!
 
 REM Verify Hash
-set /p actual_sha256=< !calculated_sha256_file!
+if /I "!expected!" neq "!actual!" (
-if /I "!expected_sha256!" neq "!actual_sha256!" (
     echo - [Verify] !file!
-    echo sha256 hash does not match, failing.
+    echo !algorithm! hash does not match, failing.
-    echo Expected:   !expected_sha256!
+    echo Expected: !expected!
-    echo Calculated: !actual_sha256!
+    echo Actual:   !actual!
     exit /B -1
 ) else (
-    echo - [Verify] !file! Hash OK: !expected_sha256!
+    echo - [Verify] !algorithm! Hash OK: !file! !expected!
-    exit /B 0
-)
-
-REM ------------------------------------------------------------------------------------------------
-:VerifyFileMD5
-set file=%~1
-set version=%~2
-set expected_md5=%~3
-
-REM Calculate hash
-set calculated_md5_file=!file!-!version!.md5.txt
-call powershell "$FileHash = Get-FileHash -algorithm md5 \"!file!\"; $FileHash.Hash.ToLower()" > !calculated_md5_file!
-
-REM Verify Hash
-set /p actual_md5=< !calculated_md5_file!
-if /I "!expected_md5!" neq "!actual_md5!" (
-    echo - [Verify] !file!
-    echo md5 hash does not match, failing.
-    echo Expected:   !expected_md5!
-    echo Calculated: !actual_md5!
-    exit /B -1
-) else (
-    echo - [Verify] !file! Hash OK: !expected_md5!
     exit /B 0
 )