From 765a7736bcb36d3c14df766565e36287e72c54e4 Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Tue, 12 Jul 2022 00:21:38 +1000
Subject: [PATCH 01/41] revise clang format

---
 Installer/os_clang_format_style_file | 496 +++++++++++++++++++++++++--
 1 file changed, 459 insertions(+), 37 deletions(-)

diff --git a/Installer/os_clang_format_style_file b/Installer/os_clang_format_style_file
index 180bf4f..4e5604a 100644
--- a/Installer/os_clang_format_style_file
+++ b/Installer/os_clang_format_style_file
@@ -1,37 +1,459 @@
-{
-    AccessModifierOffset: -4, # 1 tab
-    AlignAfterOpenBracket: true,
-    AlignConsecutiveAssignments: true,
-    AlignConsecutiveDeclarations: true,
-    AlignTrailingComments: true,
-    AllowAllParametersOfDeclarationOnNextLine: true,
-    AllowShortBlocksOnASingleLine: false,
-    AllowShortIfStatementsOnASingleLine: true,
-    AllowShortLoopsOnASingleLine: false,
-    AllowShortCaseLabelsOnASingleLine: true,
-    AlwaysBreakAfterDefinitionReturnType: false,
-    AlwaysBreakBeforeMultilineStrings: true,
-    AlwaysBreakTemplateDeclarations: true,
-    BinPackArguments: false,
-    BinPackParameters: false,
-    BreakBeforeBraces: Allman,
-    BreakConstructorInitializersBeforeComma: true,
-    ColumnLimit: 120,
-    ConstructorInitializerIndentWidth: 0,
-    Cpp11BracedListStyle: true,
-    IndentCaseLabels: true,
-    IndentFunctionDeclarationAfterType: false,
-    IndentWidth: 4, # 1 tab
-    MaxEmptyLinesToKeep: 1,
-    NamespaceIndentation: None,
-    PointerBindsToType: false,
-    SpaceBeforeAssignmentOperators: true,
-    SpaceInEmptyParentheses: false,
-    SpacesBeforeTrailingComments: 1,
-    SpacesInAngles: false,
-    SpacesInCStyleCastParentheses: false,
-    SpacesInParentheses: false,
-    SpacesInSquareBrackets: false,
-    Standard: Cpp11,
-    TabWidth: 4,
-}
+---
+IndentWidth: 4
+TabWidth: 4
+---
+Language: Cpp
+
+# Align parameters on the open bracket, e.g.:
+# someLongFunction(argument1,
+#                  argument2);
+AlignAfterOpenBracket: Align
+
+# Align array column and left justify the columns e.g.:
+# struct test demo[] =
+# {
+#     {56, 23,    "hello"},
+#     {-1, 93463, "world"},
+#     {7,  5,     "!!"   }
+# };
+AlignArrayOfStructures: Left
+
+# Align assignments on consecutive lines. This will result in formattings like:
+#
+# int a            = 1;
+# int somelongname = 2;
+# double c         = 3;
+#
+# int d = 3;
+# /* A comment. */
+# double e = 4;
+AlignConsecutiveAssignments: Consecutive
+AlignConsecutiveBitFields: Consecutive
+AlignConsecutiveDeclarations: Consecutive
+AlignConsecutiveMacros: Consecutive
+
+# Align escaped newlines as far left as possible.
+# #define A   \
+#   int aaaa; \
+#   int b;    \
+#   int dddddddddd;
+AlignEscapedNewlines: Left
+
+# Horizontally align operands of binary and ternary expressions.
+# Specifically, this aligns operands of a single expression that needs to be
+# split over multiple lines, e.g.:
+#
+# int aaa = bbbbbbbbbbbbbbb +
+#           ccccccccccccccc;
+AlignOperands: Align
+
+# true:                                   false:
+# int a;     // My comment a      vs.     int a; // My comment a
+# int b = 2; // comment  b                int b = 2; // comment about b
+AlignTrailingComments: true
+
+# If the function declaration doesn’t fit on a line, allow putting all
+# parameters of a function declaration onto the next line even if
+# BinPackParameters is false.
+#
+# true:
+# void myFunction(
+#     int a, int b, int c, int d, int e);
+#
+# false:
+# void myFunction(int a,
+#                 int b,
+#                 int c,
+#                 int d,
+#                 int e);
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: Never # "while (true) { continue; }" can be put on a single line.
+
+# If true, short case labels will be contracted to a single line.
+#
+# true:                                   false:
+# switch (a) {                    vs.     switch (a) {
+# case 1: x = 1; break;                   case 1:
+# case 2: return;                           x = 1;
+# }                                         break;
+#                                         case 2:
+#                                           return;
+#                                         }
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortEnumsOnASingleLine: true # enum { A, B } myEnum;
+
+# Only merge functions defined inside a class. Implies “empty”.
+#
+# class Foo {
+#   void f() { foo(); }
+# };
+# void f() {
+#   foo();
+# }
+# void f() {}
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: false
+
+# Only merge empty lambdas.
+#
+# auto lambda = [](int a) {}
+# auto lambda2 = [](int a) {
+#     return a;
+# };
+AllowShortLambdasOnASingleLine: Empty
+AllowShortLoopsOnASingleLine: false
+
+# true:                                  false:
+# aaaa =                         vs.     aaaa = "bbbb"
+#     "bbbb"                                    "cccc";
+#     "cccc";
+AlwaysBreakBeforeMultilineStrings: true
+
+# Force break after template declaration only when the following declaration
+# spans multiple lines.
+#
+# template <typename T> T foo() {
+# }
+# template <typename T>
+# T foo(int aaaaaaaaaaaaaaaaaaaaa,
+#       int bbbbbbbbbbbbbbbbbbbbb) {
+# }
+AlwaysBreakTemplateDeclarations: MultiLine
+
+# If false, a function call’s arguments will either be all on the same line or
+# will have one line each.
+#
+# true:
+# void f() {
+#   f(aaaaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaa,
+#     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);
+# }
+#
+# false:
+# void f() {
+#   f(aaaaaaaaaaaaaaaaaaaa,
+#     aaaaaaaaaaaaaaaaaaaa,
+#     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);
+# }
+BinPackArguments: false
+BinPackParameters: false # As BinPackArguments but for function definition parameters
+
+# Add space after the : only (space may be added before if needed for
+# AlignConsecutiveBitFields).
+#
+# unsigned bf: 2;
+BitFieldColonSpacing: After
+
+# LooooooooooongType loooooooooooooooooooooongVariable =
+#     someLooooooooooooooooongFunction();
+#
+# bool value = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +
+#                      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ==
+#                  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa &&
+#              aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa >
+#                  ccccccccccccccccccccccccccccccccccccccccc;
+BreakBeforeBinaryOperators: None
+
+# Always attach braces to surrounding context, but break before braces on
+# function, namespace and class definitions.
+BreakBeforeBraces: Linux
+
+# true:
+#  template<typename T>
+#  concept ...
+#
+# false:
+#  template<typename T> concept ...
+BreakBeforeConceptDeclarations: false
+
+# true:
+# veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongDescription
+#     ? firstValue
+#     : SecondValueVeryVeryVeryVeryLong;
+#
+# false:
+# veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongDescription ?
+#     firstValue :
+#     SecondValueVeryVeryVeryVeryLong;
+BreakBeforeTernaryOperators: true
+
+# Break constructor initializers before the colon and commas, and align the
+# commas with the colon.
+#
+# Constructor()
+#     : initializer1()
+#     , initializer2()
+BreakConstructorInitializers: BeforeComma
+
+# Break inheritance list only after the commas.
+#
+# class Foo : Base1,
+#             Base2
+# {};
+BreakInheritanceList: AfterComma
+
+# true:
+# const char* x = "veryVeryVeryVeryVeryVe"
+#                 "ryVeryVeryVeryVeryVery"
+#                 "VeryLongString";
+BreakStringLiterals: true
+ColumnLimit: 100
+
+# false:
+# namespace Foo {
+# namespace Bar {
+# }
+# }
+CompactNamespaces: false
+
+# true:                                  false:
+# vector<int> x{1, 2, 3, 4};     vs.     vector<int> x{ 1, 2, 3, 4 };
+# vector<T> x{{}, {}, {}, {}};           vector<T> x{ {}, {}, {}, {} };
+# f(MyMap[{composite, key}]);            f(MyMap[{ composite, key }]);
+# new int[3]{1, 2, 3};                   new int[3]{ 1, 2, 3 };
+Cpp11BracedListStyle: true
+
+# Analyze the formatted file for the most used line ending (\r\n or \n). UseCRLF
+# is only used as a fallback if none can be derived.
+DeriveLineEnding: true
+DerivePointerAlignment: true # As per DeriveLineEnding except for pointers and references
+
+# Add empty line only when access modifier starts a new logical block. Logical
+# block is a group of one or more member fields or functions.
+#
+# struct foo {
+# private:
+#   int i;
+#
+# protected:
+#   int j;
+#   /* comment */
+# public:
+#   foo() {}
+#
+# private:
+# protected:
+# };
+EmptyLineBeforeAccessModifier: LogicalBlock
+
+# true:                                  false:
+# namespace a {                  vs.     namespace a {
+# foo();                                 foo();
+# bar();                                 bar();
+# } // namespace a                       }
+FixNamespaceComments: true
+
+# false:                                 true:
+# class C {                      vs.     class C {
+#   class D {                                class D {
+#     void bar();                                void bar();
+#   protected:                                 protected:
+#     D();                                       D();
+#   };                                       };
+# public:                                  public:
+#   C();                                     C();
+# };                                     };
+# void foo() {                           void foo() {
+#   return 1;                              return 1;
+# }                                      }
+IndentAccessModifiers: false
+
+# false:                                 true:
+# switch (fool) {                vs.     switch (fool) {
+# case 1: {                              case 1:
+#   bar();                                 {
+# } break;                                   bar();
+# default: {                               }
+#   plop();                                break;
+# }                                      default:
+# }                                        {
+#                                            plop();
+#                                          }
+#                                        }
+IndentCaseBlocks: false
+
+# false:                                 true:
+# switch (fool) {                vs.     switch (fool) {
+# case 1:                                  case 1:
+#   bar();                                   bar();
+#   break;                                   break;
+# default:                                 default:
+#   plop();                                  plop();
+# }                                      }
+IndentCaseLabels: true
+
+# extern "C" {
+# void foo();
+# }
+IndentExternBlock: NoIndent
+
+# Indents directives before the hash.
+#
+# #if FOO
+#   #if BAR
+#     #include <foo>
+#   #endif
+# #endif
+IndentPPDirectives: BeforeHash
+
+# true:                                  false:
+# if (foo) {                     vs.     if (foo) {
+#                                          bar();
+#   bar();                               }
+# }
+KeepEmptyLinesAtTheStartOfBlocks: false
+
+# The maximum number of consecutive empty lines to keep.
+#
+# MaxEmptyLinesToKeep: 1         vs.     MaxEmptyLinesToKeep: 0
+# int f() {                              int f() {
+#   int = 1;                                 int i = 1;
+#                                            i = foo();
+#   i = foo();                               return i;
+#                                        }
+#   return i;
+# }
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+
+# Put all constructor initializers on the current line if they fit. Otherwise,
+# put each one on its own line.
+#
+# Constructor() : a(), b()
+#
+# Constructor()
+#     : aaaaaaaaaaaaaaaaaaaa(),
+#       bbbbbbbbbbbbbbbbbbbb(),
+#       ddddddddddddd()
+PackConstructorInitializers: CurrentLine
+PointerAlignment: Right
+
+# false:
+# // veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongComment with plenty of information
+# /* second veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongComment with plenty of information */
+#
+# true:
+# // veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongComment with plenty of
+# // information
+# /* second veryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongComment with plenty of
+#  * information */
+ReflowComments: true
+
+# false:                                     true:
+#
+# if (isa<FunctionDecl>(D)) {        vs.     if (isa<FunctionDecl>(D))
+#   handleFunctionDecl(D);                     handleFunctionDecl(D);
+# } else if (isa<VarDecl>(D)) {              else if (isa<VarDecl>(D))
+#   handleVarDecl(D);                          handleVarDecl(D);
+# }
+#
+# if (isa<VarDecl>(D)) {             vs.     if (isa<VarDecl>(D)) {
+#   for (auto *A : D.attrs()) {                for (auto *A : D.attrs())
+#     if (shouldProcessAttr(A)) {                if (shouldProcessAttr(A))
+#       handleAttr(A);                             handleAttr(A);
+#     }                                      }
+#   }
+# }
+#
+# if (isa<FunctionDecl>(D)) {        vs.     if (isa<FunctionDecl>(D))
+#   for (auto *A : D.attrs()) {                for (auto *A : D.attrs())
+#     handleAttr(A);                             handleAttr(A);
+#   }
+# }
+#
+# if (auto *D = (T)(D)) {            vs.     if (auto *D = (T)(D)) {
+#   if (shouldProcess(D)) {                    if (shouldProcess(D))
+#     handleVarDecl(D);                          handleVarDecl(D);
+#   } else {                                   else
+#     markAsIgnored(D);                          markAsIgnored(D);
+#   }                                        }
+# }
+# 
+# if (a) {                           vs.     if (a)
+#   b();                                       b();
+# } else {                                   else if (c)
+#   if (c) {                                   d();
+#     d();                                   else
+#   } else {                                   e();
+#     e();
+#   }
+# }
+RemoveBracesLLVM: true
+
+# Never                  v.s.     Always
+# #include <cstring>              #include <cstring>
+# struct Foo {
+#   int a, b, c;                  struct Foo {
+# };                                int a, b, c;
+# namespace Ns {                  };
+# class Bar {
+# public:                         namespace Ns {
+#   struct Foobar {               class Bar {
+#     int a;                      public:
+#     int b;                        struct Foobar {
+#   };                                int a;
+# private:                            int b;
+#   int t;                          };
+#   int method1() {
+#     // ...                      private:
+#   }                               int t;
+#   enum List {
+#     ITEM1,                        int method1() {
+#     ITEM2                           // ...
+#   };                              }
+#   template<typename T>
+#   int method2(T x) {              enum List {
+#     // ...                          ITEM1,
+#   }                                 ITEM2
+#   int i, j, k;                    };
+#   int method3(int par) {
+#     // ...                        template<typename T>
+#   }                               int method2(T x) {
+# };                                  // ...
+# class C {};                       }
+# }
+#                                   int i, j, k;
+#
+#                                   int method3(int par) {
+#                                     // ...
+#                                   }
+#                                 };
+#
+#                                 class C {};
+#                                 }
+SeparateDefinitionBlocks: Always
+
+# true:                                  false:
+# int a = 5;                     vs.     int a= 5;
+# a += 42;                               a+= 42;
+SpaceBeforeAssignmentOperators: true
+
+# Put a space before opening parentheses only after control statement keywords
+# (for/if/while...).
+#
+# void f() {
+#   if (true) {
+#     f();
+#   }
+# }
+SpaceBeforeParens: ControlStatements
+SpacesBeforeTrailingComments: 1
+
+# static_cast<int>(arg);
+# std::function<void(int)> fct;
+SpacesInAngles: Never
+
+Standard: Auto
+
+# Macros which are ignored in front of a statement, as if they were an
+# attribute. So that they are not parsed as identifier, for example for Qts
+# emit.
+# unsigned char data = 'x';
+# emit          signal(data); // This is parsed as variable declaration.
+#
+# vs.
+#
+# unsigned char data = 'x';
+# emit signal(data); // Now it's fine again.
+StatementAttributeLikeMacros: [emit]
+---

From 5272a60524dfb3c8bcb8b1e7d3e4aa0a259d984e Mon Sep 17 00:00:00 2001
From: doyle <doyle.thai@aosgrp.com>
Date: Tue, 12 Jul 2022 18:16:30 +1000
Subject: [PATCH 02/41] linux

---
 linux_install.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/linux_install.sh b/linux_install.sh
index 16d49db..bb0030b 100755
--- a/linux_install.sh
+++ b/linux_install.sh
@@ -119,11 +119,11 @@ for llvm_version in ${llvm_version_list[@]}; do
     elif [[ "${llvm_version}" == "12.0.1" ]]; then
         llvm_sha256=6b3cc55d3ef413be79785c4dc02828ab3bd6b887872b143e3091692fc6acefe7
         llvm_exe_sha256=329bba976c0cef38863129233a4b0939688eae971c7a606d41dd0e5a53d53455
-	llvm_download_label=clang+llvm-${llvm_version}-x86_64-linux-gnu-ubuntu-16.04
+        llvm_download_label=clang+llvm-${llvm_version}-x86_64-linux-gnu-ubuntu-16.04
     elif [[ "${llvm_version}" == "11.1.0" ]]; then
         llvm_sha256=c691a558967fb7709fb81e0ed80d1f775f4502810236aa968b4406526b43bee1
         llvm_exe_sha256=656bfde194276cee81dc8a7a08858313c5b5bdcfa18ac6cd6116297af2f65148
-	llvm_download_label=clang+llvm-${llvm_version}-x86_64-linux-gnu-ubuntu-16.04
+        llvm_download_label=clang+llvm-${llvm_version}-x86_64-linux-gnu-ubuntu-16.04
     fi
 
     llvm_download_file=${downloads_dir}/${llvm_download_label}.tar.xz
@@ -138,7 +138,7 @@ for llvm_version in ${llvm_version_list[@]}; do
         if [[ "${llvm_version}" == "12.0.1" ]]; then
             # NOTE: There was a distribution bug in v12.0.1 where the folder was misnamed
             mv ${llvm_dir}/clang+llvm-${llvm_version}-x86_64-linux-gnu-ubuntu-/* ${llvm_dir} || exit
-            rm --recursive ${llvm_dir}/clang+llvm-${llvm_version}-x86_64-linux-gnu-ubuntu || exit
+            rm --recursive ${llvm_dir}/clang+llvm-${llvm_version}-x86_64-linux-gnu-ubuntu- || exit
         else
             mv ${llvm_dir}/${llvm_download_label}/* ${llvm_dir} || exit
             rm --recursive ${llvm_dir}/${llvm_download_label} || exit
@@ -196,7 +196,7 @@ if [[ ! -f "${neovide_exe}" ]]; then
     DownloadFile "https://github.com/neovide/neovide/releases/download/${neovide_version}/neovide.tar.gz" ${neovide_download_file} || exit
     FileSHA256Check ${neovide_download_file} ${neovide_sha256} || exit
 
-    mkdir --parents "${cmake_dir}" && tar xf ${neovide_download_file} --skip-old-files --directory=${neovide_dir}/neovide-tmp || exit
+    mkdir --parents ${neovide_dir}/neovide-tmp && tar xf ${neovide_download_file} --skip-old-files --directory=${neovide_dir}/neovide-tmp || exit
     mv ${neovide_dir}/neovide-tmp/target/release/neovide "${neovide_exe}" || exit
     rm -rf ${neovide_dir}/neovide-tmp
 fi

From dc1606497188d92e628dd8b674dc45d0264f55b5 Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Tue, 12 Jul 2022 23:37:15 +1000
Subject: [PATCH 03/41] stuff

---
 win_helpers.bat | 23 ++++++-------
 win_install.bat | 88 ++++++++++++++++++++++++++-----------------------
 2 files changed, 57 insertions(+), 54 deletions(-)

diff --git a/win_helpers.bat b/win_helpers.bat
index fa9f171..d0db705 100644
--- a/win_helpers.bat
+++ b/win_helpers.bat
@@ -1,6 +1,6 @@
 @echo off
 setlocal EnableDelayedExpansion
-REM Win Helpers - Version 3
+REM Win Helpers - Version 4
 call %*
 goto exit
 
@@ -40,6 +40,7 @@ exit /B 0
 
 :Unzip
 REM call win_helpers.bat :Unzip <path/to/7z.exe> <zip_file> <dest>
+REM Overwrite mode: "-aos" Skip extracting of existing files
 REM ------------------------------------------------------------------------------------------------
 set zip7_exe=%~1
 set zip_file=%~2
@@ -55,13 +56,9 @@ if not exist "!zip_file!" (
     exit /B 1
 )
 
-if exist !dest! (
-    echo - [Unzip/Cached] !zip_file! to !dest!
-) else (
-    echo - [Unzip] !zip_file! to !dest!
-    call !zip7_dir!\7z.exe x -y -spe -o!dest! !zip_file!
-)
-exit /B 0
+echo - [Unzip] !zip_file! to !dest!
+call !zip7_dir!\7z.exe x -y -aos -spe -o!dest! !zip_file!
+exit /B %ERRORLEVEL%
 
 :FileHashCheck
 REM call win_helpers.bat :FileHashCheck [sha256|md5|...] <file> <hash>
@@ -90,19 +87,19 @@ if /I "!expected!" neq "!actual!" (
 echo - [FileHashCheck] !algorithm! OK [file=!file! hash=!expected!]
 exit /B 0
 
-:Move
-REM call win_helpers.bat :Move <src> <dest>
+:MoveDir
+REM call win_helpers.bat :MoveDir <src> <dest>
 REM ------------------------------------------------------------------------------------------------
 set src=%~1
 set dest=%~2
 
 if not exist "!src!" (
-    echo - [Move] File/path does not exist [file=%src%]
+    echo - [MoveDir] Directory does not exist [dir=%src%]
     exit /B 1
 )
 
-echo - [Move] Move "!src!" to "!dest!"
-robocopy "!src!" "!dest!" /E /MOVE /NP /NJS /NJS /NS /NC /NFL /NDL
+echo - [MoveDir] "!src!" to "!dest!"
+robocopy "!src!" "!dest!" /E /MOVE /MT /NP /NJS /NS /NC /NFL /NDL
 exit /B 0
 
 :MakeBatchShortcut
diff --git a/win_install.bat b/win_install.bat
index d3093de..beaa8c3 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -132,7 +132,7 @@ if not exist "!wezterm_exe!" (
     call win_helpers.bat :DownloadFile https://github.com/wez/wezterm/releases/download/!wezterm_version!/WezTerm-windows-!wezterm_version!.zip "!wezterm_zip!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :FileHashCheck sha256 "!wezterm_zip!" "!wezterm_sha256!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :Unzip "!zip7_exe!" "!wezterm_zip!" "!wezterm_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Move "!wezterm_dir!\wezterm-windows-!wezterm_version!" "!wezterm_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir "!wezterm_dir!\wezterm-windows-!wezterm_version!" "!wezterm_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!wezterm_exe!" "!wezterm_exe_sha256!" || exit /B %ERRORLEVEL%
@@ -178,7 +178,7 @@ if not exist "!cmake_exe!" (
     call win_helpers.bat :DownloadFile "https://github.com/Kitware/CMake/releases/download/v!cmake_version!/cmake-!cmake_version!-windows-x86_64.zip" "!cmake_zip!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :FileHashCheck sha256 "!cmake_zip!" "!cmake_sha256!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :Unzip "!zip7_exe!" "!cmake_zip!" "!cmake_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Move "!cmake_dir!/cmake-!cmake_version!-windows-x86_64" "!cmake_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir "!cmake_dir!/cmake-!cmake_version!-windows-x86_64" "!cmake_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!cmake_exe!" "!cmake_exe_sha256!" || exit /B %ERRORLEVEL%
@@ -200,7 +200,7 @@ if not exist "!ctags_exe!" (
     call win_helpers.bat :DownloadFile "https://github.com/universal-ctags/ctags-win32/releases/download/!ctags_version!/ctags-!ctags_version!-x64.zip" "!ctags_zip!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :FileHashCheck sha256 "!ctags_zip!" "!ctags_sha256!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :Unzip "!zip7_exe!" "!ctags_zip!" "!ctags_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Move "!ctags_dir!/ctags-!ctags_version!-windows-x86_64" "!ctags_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir "!ctags_dir!/ctags-!ctags_version!-windows-x86_64" "!ctags_dir!" || exit /B %ERRORLEVEL%
 )
 call win_helpers.bat :FileHashCheck sha256 "!ctags_exe!" "!ctags_exe_sha256!" || exit /B %ERRORLEVEL%
 call win_helpers.bat :MakeBatchShortcut "ctags" "!ctags_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
@@ -303,7 +303,7 @@ if not exist "!mingw_exe!" (
     call win_helpers.bat :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 %ERRORLEVEL%
     call win_helpers.bat :FileHashCheck sha256 !mingw_zip! !mingw_sha256! || exit /B %ERRORLEVEL%
     call win_helpers.bat :Unzip "!zip7_exe!" !mingw_zip! !mingw_dir! || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Move !mingw_dir!\mingw64 !mingw_dir! || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir !mingw_dir!\mingw64 !mingw_dir! || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!mingw_exe!" "!mingw_exe_sha256!" || exit /B %ERRORLEVEL%
@@ -348,7 +348,7 @@ if not exist "!nodejs_exe!" (
     call win_helpers.bat :DownloadFile "https://nodejs.org/dist/v!nodejs_version!/node-v!nodejs_version!-win-x64.7z" "!nodejs_zip!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :FileHashCheck sha256 "!nodejs_zip!" "!nodejs_sha256!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :Unzip "!zip7_exe!" "!nodejs_zip!" "!nodejs_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Move "!nodejs_dir!\node-v!nodejs_version!-win-x64" "!nodejs_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir "!nodejs_dir!\node-v!nodejs_version!-win-x64" "!nodejs_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!nodejs_exe!" "!nodejs_exe_sha256!" || exit /B %ERRORLEVEL%
@@ -359,34 +359,36 @@ echo set PATH=!nodejs_dir!;%%PATH%%>> "!tmp_terminal_script!"
 REM ----------------------------------------------------------------------------
 REM Python
 REM ----------------------------------------------------------------------------
-set python_sha256=93cc3db75dffb4d56b9f64af43294f130f2c222a66de7a1325d0ce8f1ed62e26
-set python_exe_sha256=9042daa88b2d3879a51bfabc2d90d4a56da05ebf184b6492a22a46fdc1c936a4
-set python_version=3.9.0.2dot
-set python_version_nodot=3902
-set python_version_dot=3.9.0
+REM We use the shared installation of python since pynvim/greenlet does not work
+REM with a static python distribution.
+set python_sha256=39EE2B12AAB9E07E2B3CE698331160C55C75CD4AFFEE028F6AE78020711D503C
+set python_exe_sha256=8677FBA3EFC27F51EA84C528B24E5824B580CE59CD5714C47073FF2459637687
 
-set python_label=Winpython64_win64_!python_version_nodot!
-set python_zip=!downloads_dir!\!python_label!.zip
+set python_date=20220630
+set python_version=3.9.13
+set python_version_and_date=!python_version!+!python_date!
+
+set python_download_ext=tar.gz
+set python_download_label=cpython-!python_version_and_date!-x86_64-pc-windows-msvc-shared-install_only
+set python_download_file=!downloads_dir!\!python_download_label!.!python_download_ext!
+
+set python_label=cpython_win64_!python_version_and_date!
 set python_dir=!tools_dir!\!python_label!
-set python_bin_dir=!python_dir!\python-!python_version_dot!.amd64\
-set python_exe=!python_bin_dir!\python.exe
+set python_exe=!python_dir!\python.exe
 
 if not exist "!python_exe!" (
-    call win_helpers.bat :DownloadFile "https://github.com/winpython/winpython/releases/download/3.0.20201028/Winpython64-!python_version!.exe" "!python_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!python_zip!" "!python_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!python_zip!" "!python_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Move "!python_dir!\WPy64-!python_version_nodot!" "!python_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "https://github.com/indygreg/python-build-standalone/releases/download/!python_date!/!python_download_label!.!python_download_ext!" "!python_download_file!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!python_download_file!" "!python_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!python_download_file!" "!downloads_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!downloads_dir!\!python_download_label!.tar" "!python_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir "!python_dir!\python" "!python_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!python_exe!" "!python_exe_sha256!" || exit /B %ERRORLEVEL%
 
-set python_bin_dir=!python_dir!\python-!python_version_dot!.amd64
-set python_scripts_bin_dir=!python_bin_dir!\Scripts
-
 REM Terminal
-echo set PATH=!python_bin_dir!;%%PATH%%>> "!tmp_terminal_script!"
-echo set PATH=!python_scripts_bin_dir!;%%PATH%%>> "!tmp_terminal_script!"
-echo set PYTHONHOME=!python_bin_dir!>> "!tmp_terminal_script!"
+echo set PYTHONHOME=!python_dir!>> "!tmp_terminal_script!"
+echo set PATH=!python_dir!;%%PATH%%>> "!tmp_terminal_script!"
 
 REM ----------------------------------------------------------------------------
 REM RenderDoc
@@ -404,7 +406,7 @@ if not exist "!renderdoc_exe!" (
     call win_helpers.bat :DownloadFile "https://renderdoc.org/stable/!renderdoc_version!/RenderDoc_!renderdoc_version!_64.zip" "!renderdoc_zip!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :FileHashCheck sha256 "!renderdoc_zip!" "!renderdoc_sha256!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :Unzip "!zip7_exe!" "!renderdoc_zip!" "!renderdoc_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Move "!renderdoc_dir!\RenderDoc_!renderdoc_version!_64" "!renderdoc_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir "!renderdoc_dir!\RenderDoc_!renderdoc_version!_64" "!renderdoc_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!renderdoc_exe!" "!renderdoc_exe_sha256!" || exit /B %ERRORLEVEL%
@@ -425,7 +427,7 @@ if not exist "!zeal_exe!" (
     call win_helpers.bat :DownloadFile "https://github.com/zealdocs/zeal/releases/download/v!zeal_version!/zeal-portable-!zeal_version!-windows-x64.7z" "!zeal_zip!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :FileHashCheck sha256 "!zeal_zip!" "!zeal_sha256!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :Unzip "!zip7_exe!" "!zeal_zip!" "!zeal_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Move "!zeal_dir!\zeal-portable-!zeal_version!-windows-x64" "!zeal_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir "!zeal_dir!\zeal-portable-!zeal_version!-windows-x64" "!zeal_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!zeal_exe!" "!zeal_exe_sha256!" || exit /B %ERRORLEVEL%
@@ -437,16 +439,19 @@ set zig_sha256=443da53387d6ae8ba6bac4b3b90e9fef4ecbe545e1c5fa3a89485c36f5c0e3a2
 set zig_exe_sha256=63c2f819cfdb1a35cb954791fc0aa48910a42065a5e1c6ff89ee16775c75a112
 set zig_version=0.9.1
 
+set zig_download_ext=zip
+set zig_download_label=zig-windows-x86_64-!zig_version!
+set zig_download_file=!downloads_dir!\!zig_download_label!.!zig_download_ext!
+
 set zig_label=zig_win64_!zig_version!
-set zig_zip=!downloads_dir!\!zig_label!.zip
 set zig_dir=!tools_dir!\!zig_label!
 set zig_exe=!zig_dir!\zig.exe
 
 if not exist "!zig_exe!" (
-    call win_helpers.bat :DownloadFile "https://ziglang.org/download/!zig_version!/zig-windows-x86_64-!zig_version!.zip" "!zig_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!zig_zip!" "!zig_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!zig_zip!" "!zig_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Move "!zig_dir!\zig-windows-x86_64-!zig_version!" "!zig_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "https://ziglang.org/download/!zig_version!/!zig_download_label!.!zig_download_ext!" "!zig_download_file!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!zig_download_file!" "!zig_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!zig_download_file!" "!zig_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir "!zig_dir!\zig-windows-x86_64-!zig_version!" "!zig_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!zig_exe!" "!zig_exe_sha256!" || exit /B %ERRORLEVEL%
@@ -462,7 +467,7 @@ set msvc_sdk_version=20348
 set msvc_dir=!tools_dir!\msvc_win64_!msvc_version!_win10_sdk_!msvc_sdk_version!
 if not exist "!msvc_dir!" (
     call "!python_exe!" !installer_dir!\win_portable-msvc.py --accept-license --msvc-version !msvc_version! --sdk-version !msvc_sdk_version! || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Move "msvc" "!msvc_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir "msvc" "!msvc_dir!" || exit /B %ERRORLEVEL%
 )
 
 REM Put the compiler into the path temporarily for compiling some programs on
@@ -634,7 +639,7 @@ if not exist "!nvim_exe!" (
     call win_helpers.bat :DownloadFile "https://github.com/neovim/neovim/releases/download/v!nvim_version!/nvim-win64.zip" "!nvim_zip!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :FileHashCheck sha256 "!nvim_zip!" "!nvim_sha256!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :Unzip "!zip7_exe!" "!nvim_zip!" "!nvim_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Move "!nvim_dir!\nvim-win64" "!nvim_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir "!nvim_dir!\nvim-win64" "!nvim_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!nvim_exe!" "!nvim_exe_sha256!" || exit /B %ERRORLEVEL%
@@ -650,13 +655,14 @@ set neovide_version=0.9.0
 
 set neovide_label=neovide_win64_!neovide_version!
 set neovide_zip=!downloads_dir!\!neovide_label!.zip
-set neovide_dir=!tools_dir!\!neovide_label!
-set neovide_exe=!neovide_dir!\neovide.exe
+set neovide_dir=!tools_dir!\
+set neovide_exe=!neovide_dir!\!neovide_label!.exe
 
 if not exist "!neovide_exe!" (
     call win_helpers.bat :DownloadFile "https://github.com/neovide/neovide/releases/download/!neovide_version!/neovide-windows.zip" "!neovide_zip!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :FileHashCheck sha256 "!neovide_zip!" "!neovide_sha256!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :Unzip "!zip7_exe!" "!neovide_zip!" "!neovide_dir!" || exit /B %ERRORLEVEL%
+    move /Y "!neovide_dir!\neovide.exe" "!neovide_exe!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!neovide_exe!" "!neovide_exe_sha256!" || exit /B %ERRORLEVEL%
@@ -676,8 +682,8 @@ if not exist "!vim_plug_dir!" mkdir "!vim_plug_dir!"
 call win_helpers.bat :DownloadFile "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" "!vim_plug!" || exit /B %ERRORLEVEL%
 
 REM Install Python NVIM module, for :py3 support
-set PYTHONHOME=!python_bin_dir!
-!python_bin_dir!\Scripts\pip.exe install pynvim cmake-language-server
+set PYTHONHOME=!python_dir!
+!python_dir!\python.exe -m pip install pynvim cmake-language-server
 
 REM ----------------------------------------------------------------------------
 REM ImHex
@@ -715,7 +721,7 @@ if not exist "!keypirinha_exe!" (
     call win_helpers.bat :DownloadFile "https://github.com/Keypirinha/Keypirinha/releases/download/v!keypirinha_version!/keypirinha-!keypirinha_version!-x64-portable.7z" "!keypirinha_zip!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :FileHashCheck sha256 "!keypirinha_zip!" "!keypirinha_sha256!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :Unzip "!zip7_exe!" "!keypirinha_zip!" "!keypirinha_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Move "!keypirinha_dir!\keypirinha" "!keypirinha_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir "!keypirinha_dir!\keypirinha" "!keypirinha_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!keypirinha_exe!" "!keypirinha_exe_sha256!" || exit /B %ERRORLEVEL%
@@ -800,7 +806,7 @@ if not exist "!rg_exe!" (
     call win_helpers.bat :DownloadFile "https://github.com/BurntSushi/ripgrep/releases/download/!rg_version!/ripgrep-!rg_version!-x86_64-pc-windows-msvc.zip" "!rg_zip!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :FileHashCheck sha256 "!rg_zip!" "!rg_sha256!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :Unzip "!zip7_exe!" "!rg_zip!" "!rg_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Move "!rg_dir!\ripgrep-!rg_version!-x86_64-pc-windows-msvc" "!rg_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir "!rg_dir!\ripgrep-!rg_version!-x86_64-pc-windows-msvc" "!rg_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!rg_exe!" "!rg_exe_sha256!" || exit /B %ERRORLEVEL%
@@ -824,7 +830,7 @@ if not exist "!fd_exe!" (
     call win_helpers.bat :DownloadFile "https://github.com/sharkdp/fd/releases/download/v!fd_version!/fd-v!fd_version!-x86_64-pc-windows-msvc.zip" "!fd_zip!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :FileHashCheck sha256 "!fd_zip!" "!fd_sha256!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :Unzip "!zip7_exe!" "!fd_zip!" "!fd_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Move "!fd_dir!\fd-v!fd_version!-x86_64-pc-windows-msvc" "!fd_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir "!fd_dir!\fd-v!fd_version!-x86_64-pc-windows-msvc" "!fd_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!fd_exe!" "!fd_exe_sha256!" || exit /B %ERRORLEVEL%
@@ -858,7 +864,7 @@ if not exist "!geth_exe!" (
     gpg --import "!geth_gpg_key!" || exit /B %ERRORLEVEL%
     gpg --verify "!geth_gpg_sig!" "!geth_zip!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :Unzip "!zip7_exe!" "!geth_zip!" "!geth_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Move "!geth_dir!\geth-windows-amd64-!geth_version!" "!geth_dir!"
+    call win_helpers.bat :MoveDir "!geth_dir!\geth-windows-amd64-!geth_version!" "!geth_dir!"
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!geth_exe!" "!geth_exe_sha256!" || exit /B %ERRORLEVEL%

From 745e6e08d6d43a67bb53c30fc1f1dd30cb5ab3db Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Fri, 15 Jul 2022 00:36:00 +1000
Subject: [PATCH 04/41] windows stuff

---
 Installer/win_portable-msvc-readme.md | 2 +-
 Installer/win_portable-msvc.py        | 1 +
 win_install.bat                       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Installer/win_portable-msvc-readme.md b/Installer/win_portable-msvc-readme.md
index a12fc2b..1fdd06d 100644
--- a/Installer/win_portable-msvc-readme.md
+++ b/Installer/win_portable-msvc-readme.md
@@ -1,6 +1,6 @@
 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.
+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.32.17.2 and v10.0.22621.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.
 
diff --git a/Installer/win_portable-msvc.py b/Installer/win_portable-msvc.py
index e2a7c0c..428f05a 100644
--- a/Installer/win_portable-msvc.py
+++ b/Installer/win_portable-msvc.py
@@ -180,6 +180,7 @@ sdk_packages = [
   f"Windows SDK for Windows Store Apps Tools-x86_en-us.msi",
   # Windows SDK headers
   f"Windows SDK for Windows Store Apps Headers-x86_en-us.msi",
+  f"Windows SDK Desktop Headers {TARGET}-x86_en-us.msi",
   # Windows SDK libs
   f"Windows SDK for Windows Store Apps Libs-x86_en-us.msi",
   f"Windows SDK Desktop Libs {TARGET}-x86_en-us.msi",
diff --git a/win_install.bat b/win_install.bat
index d3093de..9d09175 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -458,7 +458,7 @@ REM MSVC
 REM ----------------------------------------------------------------------------
 REM This depends on python, so it must be installed after it.
 set msvc_version=14.32
-set msvc_sdk_version=20348
+set msvc_sdk_version=22621
 set msvc_dir=!tools_dir!\msvc_win64_!msvc_version!_win10_sdk_!msvc_sdk_version!
 if not exist "!msvc_dir!" (
     call "!python_exe!" !installer_dir!\win_portable-msvc.py --accept-license --msvc-version !msvc_version! --sdk-version !msvc_sdk_version! || exit /B %ERRORLEVEL%

From 7972163d81e1d65fcf7a52c42677999ec7de956e Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Tue, 19 Jul 2022 10:06:30 +1000
Subject: [PATCH 05/41] windows stuff

---
 win_install.bat | 52 ++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 14 deletions(-)

diff --git a/win_install.bat b/win_install.bat
index 0222a0b..a1ac18e 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -164,24 +164,48 @@ REM ----------------------------------------------------------------------------
 REM ----------------------------------------------------------------------------
 REM CMake
 REM ----------------------------------------------------------------------------
-set cmake_sha256=9b509cc4eb7191dc128cfa3f2170036f9cbc7d9d5f93ff7fafc5b2d77b3b40dc
-set cmake_exe_sha256=326ae6ce4bd46c27f6ce46c95b48efc19848fd9fc24d71d2e8a226dadfef810c
-set cmake_version=3.23.1
+set cmake_version_list=3.23.1 !cmake_version_list!
+set cmake_version_list=3.22.2 !cmake_version_list!
+set cmake_version_list=3.10.3 !cmake_version_list!
+set cmake_version_list=!cmake_version_list!
 
-set cmake_label=cmake_win64_!cmake_version!
-set cmake_zip=!downloads_dir!\!cmake_label!.zip
-set cmake_dir=!tools_dir!\!cmake_label!
-set cmake_bin_dir=!cmake_dir!\bin
-set cmake_exe=!cmake_dir!\bin\cmake.exe
+for %%a in (%cmake_version_list%) do (
+    set cmake_version=%%a
+    set cmake_download_label=cmake-!cmake_version!-windows-x86_64
 
-if not exist "!cmake_exe!" (
-    call win_helpers.bat :DownloadFile "https://github.com/Kitware/CMake/releases/download/v!cmake_version!/cmake-!cmake_version!-windows-x86_64.zip" "!cmake_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!cmake_zip!" "!cmake_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!cmake_zip!" "!cmake_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :MoveDir "!cmake_dir!/cmake-!cmake_version!-windows-x86_64" "!cmake_dir!" || exit /B %ERRORLEVEL%
+    if "!cmake_version!"=="3.23.1" (
+        set cmake_sha256=9b509cc4eb7191dc128cfa3f2170036f9cbc7d9d5f93ff7fafc5b2d77b3b40dc
+        set cmake_exe_sha256=326ae6ce4bd46c27f6ce46c95b48efc19848fd9fc24d71d2e8a226dadfef810c
+    ) else if "!cmake_version!"=="3.22.2" (
+        set cmake_sha256=192D62EAECB0600E743F01058DFBD5B6BED91504FE8F56416FEBF54C38CE096E
+        set cmake_exe_sha256=CF1AF65D22BD01BF1CF2DB7ECEFEB730AB147549755FAA4357E5427E3175F638
+    ) else if "!cmake_version!"=="3.10.3" (
+        set cmake_sha256=3BD57D1CFCF720A4CC72DB77BDA4C76A7B700FB0341821AD868963AD28856CD0
+        set cmake_exe_sha256=F2E3B486D87D2A6BC19B3A62C740028F3F8945875196AC7D3D0E69649E98730A
+        set cmake_download_label=cmake-!cmake_version!-win64-x64
+    )
+
+    set cmake_download_ext=zip
+    set cmake_download_file=!downloads_dir!\!cmake_download_label!.!cmake_download_ext!
+    set cmake_download_url="https://github.com/Kitware/CMake/releases/download/v!cmake_version!/!cmake_download_label!.!cmake_download_ext!"
+
+    set cmake_label=cmake_win64_!cmake_version!
+    set cmake_dir=!tools_dir!\!cmake_label!
+    set cmake_bin_dir=!cmake_dir!\bin
+    set cmake_exe=!cmake_bin_dir!\cmake.exe
+
+    if not exist "!cmake_exe!" (
+        call win_helpers.bat :DownloadFile "!cmake_download_url!" "!cmake_download_file!" || exit /B %ERRORLEVEL%
+        call win_helpers.bat :FileHashCheck sha256 "!cmake_download_file!" "!cmake_sha256!" || exit /B %ERRORLEVEL%
+        call win_helpers.bat :Unzip "!zip7_exe!" "!cmake_download_file!" "!cmake_dir!" || exit /B %ERRORLEVEL%
+        call win_helpers.bat :MoveDir "!cmake_dir!/!cmake_download_label!" "!cmake_dir!" || exit /B %ERRORLEVEL%
+    )
+
+    call win_helpers.bat :FileHashCheck sha256 "!cmake_exe!" "!cmake_exe_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MakeBatchShortcut "cmake-!cmake_version!" "!cmake_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
 )
 
-call win_helpers.bat :FileHashCheck sha256 "!cmake_exe!" "!cmake_exe_sha256!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeBatchShortcut "cmake" "!cmake_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
 echo set PATH=!cmake_bin_dir!;%%PATH%%>> "!tmp_terminal_script!"
 
 REM ----------------------------------------------------------------------------

From 39ab3007fc6bc6ab50e816216644a8fdb4f4ae29 Mon Sep 17 00:00:00 2001
From: doyle <doyle.thai@aosgrp.com>
Date: Tue, 19 Jul 2022 11:45:00 +1000
Subject: [PATCH 06/41] linux stuff

---
 Installer/unix_gcc_build.sh   | 20 +++++++++++++++++
 Installer/unix_gcc_dockerfile | 42 +++++++++++++++++++++++++++++++++++
 linux_install.sh              | 22 ++++++++++++++++++
 3 files changed, 84 insertions(+)
 create mode 100755 Installer/unix_gcc_build.sh
 create mode 100644 Installer/unix_gcc_dockerfile

diff --git a/Installer/unix_gcc_build.sh b/Installer/unix_gcc_build.sh
new file mode 100755
index 0000000..4746e1f
--- /dev/null
+++ b/Installer/unix_gcc_build.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+for gcc_version in "$@"
+do
+    image_name=mostlyportable-gcc-image
+    container_name=mostlyportable-gcc
+
+    docker build -t ${image_name} --build-arg GCC_VERSION=${gcc_version} . || exit
+    docker container rm ${container_name} > /dev/null 2>&1
+    docker create --name ${container_name} ${image_name} || exit
+
+    mkdir --parent build || exit
+    docker cp ${container_name}:/usr/local/docker/gcc-mostlyportable-${gcc_version} . || exit
+
+    docker container rm ${container_name} || exit
+done
+
+if [[ $EUID == 0 ]]; then
+    chown --recursive ${USER} build
+fi
diff --git a/Installer/unix_gcc_dockerfile b/Installer/unix_gcc_dockerfile
new file mode 100644
index 0000000..62895b4
--- /dev/null
+++ b/Installer/unix_gcc_dockerfile
@@ -0,0 +1,42 @@
+FROM ubuntu:16.04 as builder
+
+RUN set -ex \
+    && apt-get update \
+    && apt-get --no-install-recommends --yes install \
+        apt-transport-https \
+        eatmydata \
+        ca-certificates
+
+# Build tools
+RUN set -ex \
+    && apt-get update \
+    && eatmydata apt-get --no-install-recommends --yes install \
+        build-essential \
+        g++-multilib \
+        git \
+        libgmp-dev \
+        libz-dev \
+        m4 \
+        schedtool \
+        texinfo \
+        texlive \
+        wget
+
+WORKDIR /usr/local/docker
+
+ARG MOSTLY_PORTABLE_GCC_GIT_BRANCH=master
+RUN set -ex \
+    && git clone https://github.com/Frogging-Family/mostlyportable-gcc \
+    && git checkout $MOSTLY_PORTABLE_GIT_BRANCH
+
+ARG GCC_VERSION=11.3.0
+ARG BIN_UTILS_VERSION=2.38
+RUN set -ex \
+    && cd mostlyportable-gcc \
+    && sed --in-place "s/^_use_gcc_git=\".*\"$/_use_gcc_git=\"false\"/" mostlyportable-gcc.cfg \
+    && sed --in-place "s/^_gcc_version=\".*\"$/_gcc_version=\"$GCC_VERSION\"/" mostlyportable-gcc.cfg \
+    && sed --in-place "s/^_use_binutils_git=\".*\"$/_use_binutils_git=\"false\"/" mostlyportable-gcc.cfg \
+    && sed --in-place "s/^_binutils=.*$/_binutils=$BIN_UTILS_VERSION/" mostlyportable-gcc.cfg \
+    && sed --in-place "s/^_use_isl_git=\".*\"$/_use_isl_git=\"false\"/" mostlyportable-gcc.cfg \
+    && sed --in-place -E "s/^(\s*)(.*)_ldconfmostlyportable;$/\1_ldconfmostlyportable=\"n\"/" mostlyportable-gcc.sh \
+    && ./mostlyportable-gcc.sh gcc
diff --git a/linux_install.sh b/linux_install.sh
index bb0030b..d132536 100755
--- a/linux_install.sh
+++ b/linux_install.sh
@@ -101,6 +101,28 @@ fi
 FileSHA256Check "${fd_exe}" "${fd_exe_sha256}" || exit
 ln --force --symbolic --relative "${fd_exe}" "${bin_dir}"
 
+# GCC
+# ------------------------------------------------------------------------------
+gcc_dir=${tools_dir}/gcc-mostlyportable
+gcc_version_list=(12.1.0 11.3.0 10.4.0 9.5.0 8.5.0 7.5.0 6.5.0)
+
+mkdir --parents "${gcc_dir}"
+cp "${installer_dir}/unix_gcc_build.sh"   "${gcc_dir}/build.sh"
+cp "${installer_dir}/unix_gcc_dockerfile" "${gcc_dir}/Dockerfile"
+
+cd "${gcc_dir}" || exit
+    for gcc_version in ${gcc_version_list[@]}; do
+        gcc_bin_dir=${gcc_dir}
+        if [[ ! -f "${gcc_bin_dir}/g++" ]]; then
+            ./build.sh ${gcc_version} || exit
+            ln -s ${gcc_bin_dir}/g++ ${bin_dir}/g++-${gcc_version} || exit
+            ln -s ${gcc_bin_dir}/gcc ${bin_dir}/gcc-${gcc_version} || exit
+        fi
+    done
+    ln -s ${gcc_bin_dir}/g++ ${bin_dir}/g++ || exit
+    ln -s ${gcc_bin_dir}/gcc ${bin_dir}/gcc || exit
+cd "${root_dir}" || exit
+
 # LLVM/Clang
 # ------------------------------------------------------------------------------
 llvm_version_list=(11.1.0 12.0.1 13.0.1 14.0.0)

From c274a6254cd39fc98b4b0041dbb54411dc221013 Mon Sep 17 00:00:00 2001
From: doyle <doyle.thai@aosgrp.com>
Date: Tue, 19 Jul 2022 15:40:33 +1000
Subject: [PATCH 07/41] linux stuff

---
 Installer/unix_gcc_build.sh   |  4 ++--
 Installer/unix_gcc_dockerfile |  1 +
 linux_install.sh              | 15 ++++++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Installer/unix_gcc_build.sh b/Installer/unix_gcc_build.sh
index 4746e1f..9638b93 100755
--- a/Installer/unix_gcc_build.sh
+++ b/Installer/unix_gcc_build.sh
@@ -10,11 +10,11 @@ do
     docker create --name ${container_name} ${image_name} || exit
 
     mkdir --parent build || exit
-    docker cp ${container_name}:/usr/local/docker/gcc-mostlyportable-${gcc_version} . || exit
+    docker cp ${container_name}:/usr/local/docker/mostlyportable-gcc/gcc-mostlyportable-${gcc_version} . || exit
 
     docker container rm ${container_name} || exit
 done
 
 if [[ $EUID == 0 ]]; then
-    chown --recursive ${USER} build
+    chown --recursive ${USER} gcc-mostlyportable-*
 fi
diff --git a/Installer/unix_gcc_dockerfile b/Installer/unix_gcc_dockerfile
index 62895b4..0a71a9f 100644
--- a/Installer/unix_gcc_dockerfile
+++ b/Installer/unix_gcc_dockerfile
@@ -27,6 +27,7 @@ WORKDIR /usr/local/docker
 ARG MOSTLY_PORTABLE_GCC_GIT_BRANCH=master
 RUN set -ex \
     && git clone https://github.com/Frogging-Family/mostlyportable-gcc \
+    && cd mostlyportable-gcc \
     && git checkout $MOSTLY_PORTABLE_GIT_BRANCH
 
 ARG GCC_VERSION=11.3.0
diff --git a/linux_install.sh b/linux_install.sh
index d132536..6b4b1f4 100755
--- a/linux_install.sh
+++ b/linux_install.sh
@@ -53,6 +53,11 @@ mkdir --parents ${bin_dir}
 
 # Tools
 # ------------------------------------------------------------------------------
+if ! command -v docker &> /dev/null
+then
+    curl -fsSL https://get.docker.com -o get-docker.sh
+    sudo sh get-docker.sh
+fi
 
 # CMake
 # ----------------------------------------------------------------------------
@@ -112,15 +117,15 @@ cp "${installer_dir}/unix_gcc_dockerfile" "${gcc_dir}/Dockerfile"
 
 cd "${gcc_dir}" || exit
     for gcc_version in ${gcc_version_list[@]}; do
-        gcc_bin_dir=${gcc_dir}
+        gcc_bin_dir=${gcc_dir}/gcc-mostlyportable-${gcc_version}/bin
         if [[ ! -f "${gcc_bin_dir}/g++" ]]; then
             ./build.sh ${gcc_version} || exit
-            ln -s ${gcc_bin_dir}/g++ ${bin_dir}/g++-${gcc_version} || exit
-            ln -s ${gcc_bin_dir}/gcc ${bin_dir}/gcc-${gcc_version} || exit
         fi
+        ln --symbolic --force --relative ${gcc_bin_dir}/g++ ${bin_dir}/g++-${gcc_version} || exit
+        ln --symbolic --force --relative ${gcc_bin_dir}/gcc ${bin_dir}/gcc-${gcc_version} || exit
     done
-    ln -s ${gcc_bin_dir}/g++ ${bin_dir}/g++ || exit
-    ln -s ${gcc_bin_dir}/gcc ${bin_dir}/gcc || exit
+    ln --symbolic --force --relative "${gcc_bin_dir}/g++" "${bin_dir}/g++" || exit
+    ln --symbolic --force --relative "${gcc_bin_dir}/gcc" "${bin_dir}/gcc" || exit
 cd "${root_dir}" || exit
 
 # LLVM/Clang

From 1bf6700fd3a4ecc856576e760029281a8b668bda Mon Sep 17 00:00:00 2001
From: doyle <doyle.thai@aosgrp.com>
Date: Tue, 19 Jul 2022 18:01:26 +1000
Subject: [PATCH 08/41] linux stuff

---
 Installer/unix_build_template.sh | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100755 Installer/unix_build_template.sh

diff --git a/Installer/unix_build_template.sh b/Installer/unix_build_template.sh
new file mode 100755
index 0000000..d9da95d
--- /dev/null
+++ b/Installer/unix_build_template.sh
@@ -0,0 +1,30 @@
+script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+compiler_list=(gcc clang)
+
+for compiler in "${compiler_list[@]}"
+do
+    version_list=()
+    if [[ "${compiler}" == "gcc" ]]; then
+        version_list+=(12.1.0)
+        version_list+=(11.3.0)
+        version_list+=(9.5.0)
+        cxx_compiler=g++
+        c_compiler=gcc
+    elif [[ "${compiler}" == "clang" ]]; then
+        version_list+=(14.0.0)
+        cxx_compiler=clang++
+        c_compiler=clang
+    fi
+
+    for version in "${version_list[@]}"
+    do
+        if [[ "${compiler}" == "gcc" ]];then
+            cmake_flags="-D CMAKE_BUILD_RPATH='/home/doyle/Developer/Tools/gcc-mostlyportable/gcc-mostlyportable-${version}/usr/lib64/'"
+        fi
+
+        build_dir=${script_dir}/build/${compiler}-${version}
+
+    done
+    cp --force ${build_dir}/compile_commands.json .
+done
+

From 94b7a80731742d58525f84dcf58487077ab9debc Mon Sep 17 00:00:00 2001
From: doyle <doyle.thai@aosgrp.com>
Date: Wed, 20 Jul 2022 13:07:17 +1000
Subject: [PATCH 09/41] linux stuff

---
 linux_install.sh | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/linux_install.sh b/linux_install.sh
index 6b4b1f4..41a4a7b 100755
--- a/linux_install.sh
+++ b/linux_install.sh
@@ -109,7 +109,14 @@ ln --force --symbolic --relative "${fd_exe}" "${bin_dir}"
 # GCC
 # ------------------------------------------------------------------------------
 gcc_dir=${tools_dir}/gcc-mostlyportable
-gcc_version_list=(12.1.0 11.3.0 10.4.0 9.5.0 8.5.0 7.5.0 6.5.0)
+gcc_version_list=()
+gcc_version_list+=(6.5.0)
+gcc_version_list+=(7.5.0)
+gcc_version_list+=(8.5.0)
+gcc_version_list+=(9.5.0)
+gcc_version_list+=(10.4.0)
+gcc_version_list+=(11.3.0)
+gcc_version_list+=(12.1.0)
 
 mkdir --parents "${gcc_dir}"
 cp "${installer_dir}/unix_gcc_build.sh"   "${gcc_dir}/build.sh"
@@ -130,7 +137,11 @@ cd "${root_dir}" || exit
 
 # LLVM/Clang
 # ------------------------------------------------------------------------------
-llvm_version_list=(11.1.0 12.0.1 13.0.1 14.0.0)
+llvm_version_list=()
+llvm_version_list+=(11.1.0)
+llvm_version_list+=(12.0.1)
+llvm_version_list+=(13.0.1)
+llvm_version_list+=(14.0.0)
 
 for llvm_version in ${llvm_version_list[@]}; do
     llvm_sha256=none
@@ -177,6 +188,24 @@ done
 
 cd "${llvm_dir}/bin" && find . -type f,l -exec ln --force --symbolic --relative "{}" "${bin_dir}/" ';' && cd "${root_dir}"
 
+# gf
+# ------------------------------------------------------------------------------
+gf_dir=${tools_dir}/gf
+
+if [[ ! -d "${gf_dir}" ]]; then
+    git clone https://github.com/nakst/gf "${tools_dir}/gf" || exit
+fi
+
+cd "${tools_dir}/gf" || exit
+git checkout master
+
+# Use our custom G++ because I typically run Ubuntu 18.04 which uses G++7
+# which is too old to compile GF.
+PATH=${gcc_bin_dir}:${PATH} ./build.sh || exit
+ln --force --symbolic --relative "gf2" "${bin_dir}"
+
+cd "${root_dir}"
+
 # Vim Configuration
 # ------------------------------------------------------------------------------
 cp --force ${installer_dir}/os_vimrc ~/.vimrc || exit

From 588174a759ad283bad7e7943c2b00dbb509941bb Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Fri, 22 Jul 2022 23:40:39 +1000
Subject: [PATCH 10/41] windows stuff

---
 win_install.bat | 75 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 46 insertions(+), 29 deletions(-)

diff --git a/win_install.bat b/win_install.bat
index a1ac18e..53cef28 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -392,19 +392,18 @@ set python_date=20220630
 set python_version=3.9.13
 set python_version_and_date=!python_version!+!python_date!
 
-set python_download_ext=tar.gz
-set python_download_label=cpython-!python_version_and_date!-x86_64-pc-windows-msvc-shared-install_only
-set python_download_file=!downloads_dir!\!python_download_label!.!python_download_ext!
+set python_download_name=cpython-!python_version_and_date!-x86_64-pc-windows-msvc-shared-install_only
+set python_download_file=!python_download_name!.tar.gz
+set python_download_path=!downloads_dir!\!python_download_file!
 
-set python_label=cpython_win64_!python_version_and_date!
-set python_dir=!tools_dir!\!python_label!
+set python_dir=!tools_dir!\cpython_win64_!python_version_and_date!
 set python_exe=!python_dir!\python.exe
 
 if not exist "!python_exe!" (
-    call win_helpers.bat :DownloadFile "https://github.com/indygreg/python-build-standalone/releases/download/!python_date!/!python_download_label!.!python_download_ext!" "!python_download_file!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!python_download_file!" "!python_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!python_download_file!" "!downloads_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!downloads_dir!\!python_download_label!.tar" "!python_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "https://github.com/indygreg/python-build-standalone/releases/download/!python_date!/!python_download_file!" "!python_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!python_download_path!" "!python_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!python_download_path!" "!downloads_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!downloads_dir!\!python_download_name!.tar" "!python_dir!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :MoveDir "!python_dir!\python" "!python_dir!" || exit /B %ERRORLEVEL%
 )
 
@@ -504,23 +503,38 @@ echo call "!msvc_dir!\setup.bat">> "!tmp_terminal_script!"
 REM ----------------------------------------------------------------------------
 REM Symget
 REM ----------------------------------------------------------------------------
-REM set symget_dir=!tools_dir!\symget
-REM if not exist "!symget_dir!" (
-REM     call !git_exe! clone https://github.com/mmozeiko/symget.git !symget_dir! || exit /B %ERRORLEVEL%
-REM )
-REM
-REM call !git_exe! -C !symget_dir! pull origin main || exit /B %ERRORLEVEL%
-REM call !git_exe! -C !symget_dir! checkout 79b026f || exit /B %ERRORLEVEL%
+set symget_git_hash=79b026f
+set symget_dir=!tools_dir!\symget
+set symget_exe=!symget_dir!\symget.exe
+if not exist "!symget_dir!" (
+    call !git_exe! clone https://github.com/mmozeiko/symget.git !symget_dir! || exit /B %ERRORLEVEL%
+)
+
+REM Extract current git hash of the repository. Remove the last character as
+REM rev-parse has a trailing whitespace.
+for /F "tokens=1 USEBACKQ" %%F IN (`"!git_exe!" -C !symget_dir! rev-parse --short HEAD`) do ( SET symget_curr_git_hash=%%F )
+set symget_curr_git_hash=!symget_curr_git_hash:~0,-1!
+
+if !symget_curr_git_hash! neq !symget_git_hash! (
+    call !git_exe! -C !symget_dir! checkout !symget_git_hash! || exit /B %ERRORLEVEL%
+    if exist !symget_exe! del /F !symget_exe!
+)
+
+if not exist "!symget_exe!" (
+    pushd !symget_dir!
+    call build.cmd
+    popd
+)
 
 REM ----------------------------------------------------------------------------
 REM Odin
 REM ----------------------------------------------------------------------------
-set odin_git_hash=a4cb6f96
+set odin_git_hash=227ee0f
 set odin_dir=!tools_dir!\odin_win64
 set odin_exe=!odin_dir!\odin.exe
 
 if not exist "!odin_dir!" (
-    call !git_exe! clone https://github.com/odin-lang/odin.git !odin_dir! || exit /B %ERRORLEVEL%
+    call !git_exe! clone "https://github.com/odin-lang/odin.git" !odin_dir! || exit /B %ERRORLEVEL%
 )
 
 REM Extract current git hash of the repository. Remove the last character as
@@ -529,8 +543,8 @@ for /F "tokens=1 USEBACKQ" %%F IN (`"!git_exe!" -C !odin_dir! rev-parse --short
 set odin_curr_git_hash=!odin_curr_git_hash:~0,-1!
 
 if !odin_curr_git_hash! neq !odin_git_hash! (
-    call !git_exe! -C !odin_dir! pull origin master || exit /B %ERRORLEVEL%
     call !git_exe! -C !odin_dir! checkout !odin_git_hash! || exit /B %ERRORLEVEL%
+    if exist !odin_exe! del /F !odin_exe!
 )
 
 if not exist "!odin_exe!" (
@@ -547,21 +561,24 @@ REM ----------------------------------------------------------------------------
 REM ----------------------------------------------------------------------------
 REM clink - Bash style tab completion in terminal
 REM ----------------------------------------------------------------------------
-set clink_sha256=00A516A9D072E46ADF381156703E54CDF086A1F078D006971E6D96DFA0186881
-set clink_exe_sha256=7448FD3BE1CB698A154AAA9F2EB27146B81EE266F27BFE993B342C22C25E520A
-set clink_version=1.3.35
-set clink_git_hash=5e327d
+set clink_sha256=6FD44B1D085ABC8319108986C0E19B119D54BC84A753397D567A5F62950F0ACC
+set clink_exe_sha256=138F680A25C993ACE201B844DEAC7F42D8D3EC9F02042D3DE7E9B6426C8A6D42
+set clink_version=1.3.37
+set clink_git_hash=b85068
 
-set clink_label=clink_win64_!clink_version!
-set clink_zip=!downloads_dir!\!clink_label!.zip
-set clink_dir=!tools_dir!\!clink_label!
+set clink_download_name=clink.!clink_version!.!clink_git_hash!
+set clink_download_file=!clink_download_name!.zip
+set clink_download_path=!downloads_dir!\!clink_download_file!
+set clink_download_url="https://github.com/chrisant996/clink/releases/download/v!clink_version!/!clink_download_file!"
+
+set clink_dir=!tools_dir!\clink_win64_!clink_version!
 set clink_exe=!clink_dir!\clink_x64.exe
 set clink_bat=!clink_dir!\clink.bat
 
 if not exist "!clink_exe!" (
-    call win_helpers.bat :DownloadFile "https://github.com/chrisant996/clink/releases/download/v!clink_version!/clink.!clink_version!.!clink_git_hash!.zip" "!clink_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!clink_zip!" "!clink_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!clink_zip!" "!clink_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!clink_download_url!" "!clink_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!clink_download_path!" "!clink_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!clink_download_path!" "!clink_dir!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :OverwriteCopy "!clink_dir!\_default_inputrc" "!clink_dir!\default_inputrc" || exit /B %ERRORLEVEL%
     call win_helpers.bat :OverwriteCopy "!clink_dir!\_default_settings" "!clink_dir!\default_settings" || exit /B %ERRORLEVEL%
 )

From 8501efd8f81b869f73f20a873bd7d288596b72b8 Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Sun, 24 Jul 2022 11:05:37 +1000
Subject: [PATCH 11/41] windows stuff

---
 win_install.bat | 517 ++++++++++++++++++++++++++----------------------
 1 file changed, 279 insertions(+), 238 deletions(-)

diff --git a/win_install.bat b/win_install.bat
index 53cef28..6118ea4 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -1,7 +1,6 @@
 @echo off
 setlocal EnableDelayedExpansion
 
-REM ----------------------------------------------------------------------------
 REM Setup
 REM ----------------------------------------------------------------------------
 set root_dir=%~dp0
@@ -27,7 +26,6 @@ echo set APPDATA=!home_dir!\AppData>> "!tmp_terminal_script!"
 echo set LOCALAPPDATA=!home_dir!\AppData\Local>> "!tmp_terminal_script!"
 echo set PATH=!bin_dir!;%%PATH%%>> "!tmp_terminal_script!"
 
-REM ----------------------------------------------------------------------------
 REM Setup tools for setting up the development environment
 REM ----------------------------------------------------------------------------
 REM We are ultra pedantic and we check the hashes of the distribution but also
@@ -38,7 +36,6 @@ REM
 REM Unforunately, since this is not standard practice to provide by
 REM distributions we have to calculate them manually.
 
-REM ----------------------------------------------------------------------------
 REM Bootstrap 7zip
 REM ----------------------------------------------------------------------------
 REM We get an old version of 7z that is available as a .zip file which we can
@@ -47,19 +44,22 @@ set zip7_bootstrap_sha256=2a3afe19c180f8373fa02ff00254d5394fec0349f5804e0ad2f606
 set zip7_bootstrap_exe_sha256=c136b1467d669a725478a6110ebaaab3cb88a3d389dfa688e06173c066b76fcf
 set zip7_bootstrap_version=920
 
-set zip7_bootstrap_label=7zip_bootstrap_win32_!zip7_bootstrap_version!
-set zip7_bootstrap_zip=!downloads_dir!\!zip7_bootstrap_label!.zip
-set zip7_bootstrap_dir=!tools_dir!\!zip7_bootstrap_label!
+set zip7_bootstrap_download_name=7za!zip7_bootstrap_version!
+set zip7_bootstrap_download_file=!zip7_bootstrap_download_name!.zip
+set zip7_bootstrap_download_path=!downloads_dir!\!zip7_bootstrap_download_file!
+set zip7_bootstrap_download_url="https://www.7-zip.org/a/!zip7_bootstrap_download_file!"
+
+set zip7_bootstrap_dir=!tools_dir!\7zip_bootstrap_win32_!zip7_bootstrap_version!
 set zip7_bootstrap_exe=!zip7_bootstrap_dir!\7za.exe
 
 if not exist "!zip7_bootstrap_exe!" (
-    call win_helpers.bat :DownloadFile "https://www.7-zip.org/a/7za!zip7_bootstrap_version!.zip" "!zip7_bootstrap_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!zip7_bootstrap_zip!" "!zip7_bootstrap_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!zip7_bootstrap_download_url!" "!zip7_bootstrap_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!zip7_bootstrap_download_path!" "!zip7_bootstrap_sha256!" || exit /B %ERRORLEVEL%
 )
-if not exist "!zip7_bootstrap_dir!" powershell "Expand-Archive !zip7_bootstrap_zip! -DestinationPath !zip7_bootstrap_dir!" || exit /B %ERRORLEVEL%
+
+if not exist "!zip7_bootstrap_dir!" powershell "Expand-Archive !zip7_bootstrap_download_path! -DestinationPath !zip7_bootstrap_dir!" || exit /B %ERRORLEVEL%
 call win_helpers.bat :FileHashCheck sha256 "!zip7_bootstrap_exe!" "!zip7_bootstrap_exe_sha256!" || exit /B %ERRORLEVEL%
 
-REM ----------------------------------------------------------------------------
 REM 7zip
 REM ----------------------------------------------------------------------------
 REM Use our bootstrap 7z from above to download the latest 7zip version
@@ -69,15 +69,18 @@ set zip7_sha256=0b461f0a0eccfc4f39733a80d70fd1210fdd69f600fb6b657e03940a734e5fc1
 set zip7_exe_sha256=ed24ed04b5d4a20b3f50fc088a455195c756d7b5315d1965e8c569472b43d939
 set zip7_version=2107
 
-set zip7_label=7zip_win64_!zip7_version!
-set zip7_zip=!downloads_dir!\!zip7_label!.exe
-set zip7_dir=!tools_dir!\!zip7_label!
+set zip7_download_name=7z!zip7_version!-x64
+set zip7_download_file=!zip7_download_name!.exe
+set zip7_download_path=!downloads_dir!\!zip7_download_file!
+set zip7_download_url="https://www.7-zip.org/a/!zip7_download_file!"
+
+set zip7_dir=!tools_dir!\7zip_win64_!zip7_version!
 set zip7_exe=!zip7_dir!\7z.exe
 
 if not exist "!zip7_exe!" (
-    call win_helpers.bat :DownloadFile "https://www.7-zip.org/a/7z!zip7_version!-x64.exe" "!zip7_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!zip7_zip!" "!zip7_sha256!" || exit /B %ERRORLEVEL%
-    "!zip7_bootstrap_exe!" x -y -o"!zip7_dir!" !zip7_zip! || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!zip7_download_url!" "!zip7_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!zip7_download_path!" "!zip7_sha256!" || exit /B %ERRORLEVEL%
+    "!zip7_bootstrap_exe!" x -y -o"!zip7_dir!" !zip7_download_path! || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!zip7_exe!" "!zip7_exe_sha256!" || exit /B %ERRORLEVEL%
@@ -85,7 +88,6 @@ call win_helpers.bat :FileHashCheck sha256 "!zip7_exe!" "!zip7_exe_sha256!" || e
 REM Terminal
 echo set PATH=!zip7_dir!;%%PATH%%>> "!tmp_terminal_script!"
 
-REM ----------------------------------------------------------------------------
 REM GPG Signature Verification
 REM ----------------------------------------------------------------------------
 set gpg_w32_sha256=1a18adbb24868e14a40ccbd60003108840e238c0893e7bb6908805ae067eb0e8
@@ -93,16 +95,19 @@ set gpg_w32_exe_sha256=ac181fb744df2950880458f8e18eb005de38e5c9858d13f0f772b5ae1
 set gpg_w32_version=2.3.6
 set gpg_w32_date=20220425
 
-set gpg_w32_label=gpg_win32_!gpg_w32_version!
-set gpg_w32_zip=!downloads_dir!\!gpg_w32_label!.exe
-set gpg_w32_dir=!tools_dir!\!gpg_w32_label!
+set gpg_download_name=gnupg-w32-!gpg_w32_version!_!gpg_w32_date!
+set gpg_download_file=!gpg_download_name!.exe
+set gpg_download_path=!downloads_dir!\!gpg_download_file!
+set gpg_download_url="https://gnupg.org/ftp/gcrypt/binary/!gpg_download_file!"
+
+set gpg_w32_dir=!tools_dir!\gpg_win32_!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 win_helpers.bat :DownloadFile "https://gnupg.org/ftp/gcrypt/binary/gnupg-w32-!gpg_w32_version!_!gpg_w32_date!.exe" "!gpg_w32_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!gpg_w32_zip!" "!gpg_w32_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!gpg_w32_zip!" "!gpg_w32_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!gpg_download_url!" "!gpg_w32_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!gpg_w32_download_path!" "!gpg_w32_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!gpg_w32_download_path!" "!gpg_w32_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!gpg_w32_exe!" "!gpg_w32_exe_sha256!" || exit /B %ERRORLEVEL%
@@ -111,57 +116,58 @@ set PATH="!gpg_w32_bin_dir!";!PATH!
 REM Terminal
 echo set PATH=!gpg_w32_bin_dir!;%%PATH%%>> "!tmp_terminal_script!"
 
-REM ----------------------------------------------------------------------------
 REM Application Setup
 REM ----------------------------------------------------------------------------
 REM Download & verify the tools we want for development
 
-REM ----------------------------------------------------------------------------
 REM Wezterm
 REM ----------------------------------------------------------------------------
 set wezterm_sha256=c634e98fa9715766bbb00cbc3c8a23d1d558c8cd5716ad2efca45ed4e0ef82f9
 set wezterm_exe_sha256=b9b5bae20d0679127ca0c4da276dff3b7b32310bfbfaede26a9b8ecb55e295ce
 set wezterm_version=20220408-101518-b908e2dd
 
-set wezterm_label=wezterm_win64_!wezterm_version!
-set wezterm_zip=!downloads_dir!\!wezterm_label!.zip
-set wezterm_dir=!tools_dir!\!wezterm_label!
+set wezterm_download_name=WezTerm-windows-!wezterm_version!
+set wezterm_download_file=!wezterm_download_name!.zip
+set wezterm_download_path=!downloads_dir!\!wezterm_download_file!
+set wezterm_download_url="https://github.com/wez/wezterm/releases/download/!wezterm_version!/!wezterm_download_file!"
+
+set wezterm_dir=!tools_dir!\wezterm_win64_!wezterm_version!
 set wezterm_exe=!wezterm_dir!\wezterm-gui.exe
 
 if not exist "!wezterm_exe!" (
-    call win_helpers.bat :DownloadFile https://github.com/wez/wezterm/releases/download/!wezterm_version!/WezTerm-windows-!wezterm_version!.zip "!wezterm_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!wezterm_zip!" "!wezterm_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!wezterm_zip!" "!wezterm_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :MoveDir "!wezterm_dir!\wezterm-windows-!wezterm_version!" "!wezterm_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!wezterm_download_url!" "!wezterm_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!wezterm_download_path!" "!wezterm_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!wezterm_download_path!" "!wezterm_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir "!wezterm_dir!\!wezterm_download_Name!" "!wezterm_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!wezterm_exe!" "!wezterm_exe_sha256!" || exit /B %ERRORLEVEL%
 call win_helpers.bat :OverwriteCopy "!installer_dir!\os_wezterm.lua" "!wezterm_dir!\wezterm.lua" || exit /B %ERRORLEVEL%
 
-REM ----------------------------------------------------------------------------
 REM Jetbrains Mono Font
 REM ----------------------------------------------------------------------------
 set jetbrains_mono_sha256=4e315b4ef176ce7ffc971b14997bdc8f646e3d1e5b913d1ecba3a3b10b4a1a9f
 set jetbrains_mono_file_sha256=50e1dcb40298fcfcc21a1ef3cbee9fe9e82709c48ad30ce617472c06a3bd9436
 set jetbrains_mono_version=2.242
 
-set jetbrains_mono_label=jetbrains_mono_!jetbrains_mono_version!
-set jetbrains_mono_zip=!downloads_dir!\!jetbrains_mono_label!.zip
-set jetbrains_mono_dir=!tools_dir!\!jetbrains_mono_label!
+set jetbrains_download_name=JetBrainsMono-!jetbrains_mono_version!
+set jetbrains_download_file=!jetbrains_download_name!.zip
+set jetbrains_download_path=!downloads_dir!\!jetbrains_download_file!
+set jetbrains_download_url="https://download.jetbrains.com/fonts/!jetbrains_download_file!"
+
+set jetbrains_mono_dir=!tools_dir!\jetbrains_mono_!jetbrains_mono_version!
 set jetbrains_mono_file=!jetbrains_mono_dir!\fonts\ttf\JetBrainsMono-Regular.ttf
 
 if not exist "!jetbrains_mono_file!" (
-    call win_helpers.bat :DownloadFile https://download.jetbrains.com/fonts/JetBrainsMono-!jetbrains_mono_version!.zip "!jetbrains_mono_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!jetbrains_mono_zip!" "!jetbrains_mono_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!jetbrains_mono_zip!" "!jetbrains_mono_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!jetbrains_download_url!" "!jetbrains_mono_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!jetbrains_mono_download_path!" "!jetbrains_mono_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!jetbrains_mono_download_path!" "!jetbrains_mono_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!jetbrains_mono_file!" "!jetbrains_mono_file_sha256!" || exit /B %ERRORLEVEL%
 
-REM ----------------------------------------------------------------------------
 REM Programming
 REM ----------------------------------------------------------------------------
-REM ----------------------------------------------------------------------------
 REM CMake
 REM ----------------------------------------------------------------------------
 set cmake_version_list=3.23.1 !cmake_version_list!
@@ -171,7 +177,7 @@ set cmake_version_list=!cmake_version_list!
 
 for %%a in (%cmake_version_list%) do (
     set cmake_version=%%a
-    set cmake_download_label=cmake-!cmake_version!-windows-x86_64
+    set cmake_download_name=cmake-!cmake_version!-windows-x86_64
 
     if "!cmake_version!"=="3.23.1" (
         set cmake_sha256=9b509cc4eb7191dc128cfa3f2170036f9cbc7d9d5f93ff7fafc5b2d77b3b40dc
@@ -182,23 +188,22 @@ for %%a in (%cmake_version_list%) do (
     ) else if "!cmake_version!"=="3.10.3" (
         set cmake_sha256=3BD57D1CFCF720A4CC72DB77BDA4C76A7B700FB0341821AD868963AD28856CD0
         set cmake_exe_sha256=F2E3B486D87D2A6BC19B3A62C740028F3F8945875196AC7D3D0E69649E98730A
-        set cmake_download_label=cmake-!cmake_version!-win64-x64
+        set cmake_download_name=cmake-!cmake_version!-win64-x64
     )
 
-    set cmake_download_ext=zip
-    set cmake_download_file=!downloads_dir!\!cmake_download_label!.!cmake_download_ext!
-    set cmake_download_url="https://github.com/Kitware/CMake/releases/download/v!cmake_version!/!cmake_download_label!.!cmake_download_ext!"
+    set cmake_download_file=!cmake_download_name!.zip
+    set cmake_download_path=!downloads_dir!\!cmake_download_file!
+    set cmake_download_url="https://github.com/Kitware/CMake/releases/download/v!cmake_version!/!cmake_download_file!"
 
-    set cmake_label=cmake_win64_!cmake_version!
-    set cmake_dir=!tools_dir!\!cmake_label!
+    set cmake_dir=!tools_dir!\cmake_win64_!cmake_version!
     set cmake_bin_dir=!cmake_dir!\bin
     set cmake_exe=!cmake_bin_dir!\cmake.exe
 
     if not exist "!cmake_exe!" (
-        call win_helpers.bat :DownloadFile "!cmake_download_url!" "!cmake_download_file!" || exit /B %ERRORLEVEL%
-        call win_helpers.bat :FileHashCheck sha256 "!cmake_download_file!" "!cmake_sha256!" || exit /B %ERRORLEVEL%
-        call win_helpers.bat :Unzip "!zip7_exe!" "!cmake_download_file!" "!cmake_dir!" || exit /B %ERRORLEVEL%
-        call win_helpers.bat :MoveDir "!cmake_dir!/!cmake_download_label!" "!cmake_dir!" || exit /B %ERRORLEVEL%
+        call win_helpers.bat :DownloadFile "!cmake_download_url!" "!cmake_download_path!" || exit /B %ERRORLEVEL%
+        call win_helpers.bat :FileHashCheck sha256 "!cmake_download_path!" "!cmake_sha256!" || exit /B %ERRORLEVEL%
+        call win_helpers.bat :Unzip "!zip7_exe!" "!cmake_download_path!" "!cmake_dir!" || exit /B %ERRORLEVEL%
+        call win_helpers.bat :MoveDir "!cmake_dir!/!cmake_download_name!" "!cmake_dir!" || exit /B %ERRORLEVEL%
     )
 
     call win_helpers.bat :FileHashCheck sha256 "!cmake_exe!" "!cmake_exe_sha256!" || exit /B %ERRORLEVEL%
@@ -208,45 +213,49 @@ for %%a in (%cmake_version_list%) do (
 call win_helpers.bat :MakeBatchShortcut "cmake" "!cmake_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
 echo set PATH=!cmake_bin_dir!;%%PATH%%>> "!tmp_terminal_script!"
 
-REM ----------------------------------------------------------------------------
 REM ctags
 REM ----------------------------------------------------------------------------
 set ctags_sha256=B82648E9A3B2C8E50E0283A47B4F013F1B52E0F0E56DBB4F1C805D17578C4DF2
 set ctags_exe_sha256=7465E2D34EAF5F901AC45D7E9ED4AC8E7D3A532964D0D77A94F2D0EE3AE145AA
 set ctags_version=p5.9.20220612.0
 
-set ctags_label=ctags_win64_!ctags_version!
-set ctags_zip=!downloads_dir!\!ctags_label!.zip
-set ctags_dir=!tools_dir!\!ctags_label!
+set ctags_download_name=ctags-!ctags_version!-x64
+set ctags_download_file=!ctags_download_name!.zip
+set ctags_download_path=!downloads_dir!\!ctags_download_file!
+set ctags_download_url="https://github.com/universal-ctags/ctags-win32/releases/download/!ctags_version!/!ctags_download_file!"
+
+set ctags_dir=!tools_dir!\ctags_win64_!ctags_version!
 set ctags_exe=!ctags_dir!\ctags.exe
 
 if not exist "!ctags_exe!" (
-    call win_helpers.bat :DownloadFile "https://github.com/universal-ctags/ctags-win32/releases/download/!ctags_version!/ctags-!ctags_version!-x64.zip" "!ctags_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!ctags_zip!" "!ctags_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!ctags_zip!" "!ctags_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!ctags_download_url!" "!ctags_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!ctags_download_path!" "!ctags_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!ctags_download_path!" "!ctags_dir!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :MoveDir "!ctags_dir!/ctags-!ctags_version!-windows-x86_64" "!ctags_dir!" || exit /B %ERRORLEVEL%
 )
 call win_helpers.bat :FileHashCheck sha256 "!ctags_exe!" "!ctags_exe_sha256!" || exit /B %ERRORLEVEL%
 call win_helpers.bat :MakeBatchShortcut "ctags" "!ctags_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
 
-REM ----------------------------------------------------------------------------
 REM Git
 REM ----------------------------------------------------------------------------
 set git_sha256=bc030848e282d49e562ae2392a72501cf539322ad06ffe4cea8cf766f148dfe8
 set git_exe_sha256=ae463cad04c2b15fc91de68ab096933ec08c44752e205aebd7d64c3a482df62d
 set git_version=2.33.0
 
-set git_label=PortableGit_win64_!git_version!
-set git_zip=!downloads_dir!\!git_label!.7z.exe
+set git_download_name=PortableGit-!git_version!.2-64-bit.7z
+set git_download_file=!git_download_name!.exe
+set git_download_path=!downloads_dir!\!git_download_file!
+set git_download_url="https://github.com/git-for-windows/git/releases/download/v!git_version!.windows.2/!git_download_file!"
+
 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!\!git_label!
+set git_install_dir=!tools_dir!\PortableGit_win64_!git_version!
 set git_exe=!git_install_dir!\cmd\git.exe
 
 if not exist "!git_exe!" (
-    call win_helpers.bat :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 %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!git_zip!" "!git_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!git_zip!" "!git_install_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!git_download_url!" "!git_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!git_download_path!" "!git_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!git_download_path!" "!git_install_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!git_exe!" "!git_exe_sha256!" || exit /B %ERRORLEVEL%
@@ -256,7 +265,6 @@ echo set PATH=!git_install_dir!\cmd;%%PATH%%>> "!tmp_terminal_script!"
 echo set PATH=!git_install_dir!\mingw64\bin;%%PATH%%>> "!tmp_terminal_script!"
 echo set PATH=!git_install_dir!\usr\bin;%%PATH%%>> "!tmp_terminal_script!"
 
-REM ----------------------------------------------------------------------------
 REM LLVM/Clang
 REM ----------------------------------------------------------------------------
 REM NOTE: This list must be in descending order, latest version at the top. This
@@ -276,25 +284,29 @@ for %%a in (%llvm_version_list%) do (
     if "!llvm_version!"=="12.0.1" set llvm_exe_sha256=9f0748de7f946c210a030452de226986bab46a0121d7236ea0e7b5079cb6dfef
     if "!llvm_version!"=="11.1.0" set llvm_exe_sha256=F72591F8A02E4B7573AA2FCD2999A3EA76FE729E2468E5414853617268798DFD
 
-    set llvm_label=llvm_win64_!llvm_version!
-    set llvm_zip=!downloads_dir!\!llvm_label!.exe
-    set llvm_dir=!tools_dir!\!llvm_label!
+    set llvm_download_name=LLVM-!llvm_version!-win64
+    set llvm_download_file=!llvm_download_name!.exe
+    set llvm_download_path=!downloads_dir!\!llvm_download_file!
+    set llvm_download_url="https://github.com/llvm/llvm-project/releases/download/llvmorg-!llvm_version!/!llvm_download_file!"
+
+    set llvm_dir=!tools_dir!\llvm_win64_!llvm_version!
     set llvm_bin_dir=!llvm_dir!\bin
     set llvm_exe=!llvm_bin_dir!\clang.exe
 
+    set llvm_gpg_key_download_url="https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/tstellar-gpg-key.asc"
     set llvm_gpg_key=!downloads_dir!\llvm_tstellar_gpg_key.asc
-    set llvm_gpg_sig=!llvm_zip!.sig
+    set llvm_gpg_sig=!llvm_download_path!.sig
 
     if not exist "!llvm_exe!" (
-        call win_helpers.bat :DownloadFile "https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/tstellar-gpg-key.asc" "!llvm_gpg_key!" || exit /B %ERRORLEVEL%
-        call win_helpers.bat :DownloadFile "https://github.com/llvm/llvm-project/releases/download/llvmorg-!llvm_version!/LLVM-!llvm_version!-win64.exe" "!llvm_zip!" || exit /B %ERRORLEVEL%
+        call win_helpers.bat :DownloadFile "!llvm_gpg_key_download_url!" "!llvm_gpg_key!" || exit /B %ERRORLEVEL%
+        call win_helpers.bat :DownloadFile "!llvm_download_url!" "!llvm_download_path!" || exit /B %ERRORLEVEL%
 
         REM Version 14.0.5 doesn't ship with signatures?
         REM call win_helpers.bat :DownloadFile "https://github.com/llvm/llvm-project/releases/download/llvmorg-!llvm_version!/LLVM-!llvm_version!-win64.exe.sig" "!llvm_gpg_sig!" || exit /B %ERRORLEVEL%
         REM gpg --import "!llvm_gpg_key!" || exit /B %ERRORLEVEL%
-        REM gpg --verify "!llvm_gpg_sig!" "!llvm_zip!" || exit /B %ERRORLEVEL%
+        REM gpg --verify "!llvm_gpg_sig!" "!llvm_download_path!" || exit /B %ERRORLEVEL%
 
-        call win_helpers.bat :Unzip "!zip7_exe!" "!llvm_zip!" "!llvm_dir!" || exit /B %ERRORLEVEL%
+        call win_helpers.bat :Unzip "!zip7_exe!" "!llvm_download_path!" "!llvm_dir!" || exit /B %ERRORLEVEL%
     )
 
     call win_helpers.bat :FileHashCheck sha256 "!llvm_exe!" "!llvm_exe_sha256!" || exit /B %ERRORLEVEL%
@@ -310,23 +322,25 @@ call win_helpers.bat :OverwriteCopy "!llvm_dir!\share\clang\clang-format.py" "!c
 REM Terminal
 echo set PATH=!llvm_bin_dir!;%%PATH%%>> "!tmp_terminal_script!"
 
-REM ------------------------------------------------------------------------
 REM MinGW64
 REM ------------------------------------------------------------------------
 set mingw_sha256=853970527b5de4a55ec8ca4d3fd732c00ae1c69974cc930c82604396d43e79f8
 set mingw_exe_sha256=c5f0953f7a71ddcdf0852e1e44a43cef9b8fe121beba4d4202bfe6d405de47c0
 set mingw_version=8.1.0
 
-set mingw_label=mingw64-posix-seg-rt_v6-rev0_win64_!mingw_version!
-set mingw_zip=!downloads_dir!\!mingw_label!.7z
-set mingw_dir=!tools_dir!\!mingw_label!
+set mingw_download_name=x86_64-!mingw_version!-release-posix-seh-rt_v6-rev0
+set mingw_download_file=!mingw_download_name!.7z
+set mingw_download_path=!downloads_dir!\!mingw_download_file!
+set mingw_download_url="https://sourceforge.net/projects/mingw-w64/files/Toolchains targetting Win64/Personal Builds/mingw-builds/!mingw_version!/threads-posix/seh/!mingw_download_file!\"
+
+set mingw_dir=!tools_dir!\mingw64-posix-seg-rt_v6-rev0_win64_!mingw_version!
 set mingw_bin_dir=!mingw_dir!\bin
 set mingw_exe=!mingw_bin_dir!\gcc.exe
 
 if not exist "!mingw_exe!" (
-    call win_helpers.bat :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 %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 !mingw_zip! !mingw_sha256! || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" !mingw_zip! !mingw_dir! || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile \"!mingw_download_url!\" !ming_download_path! || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 !ming_download_path! !mingw_sha256! || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" !ming_download_path! !mingw_dir! || exit /B %ERRORLEVEL%
     call win_helpers.bat :MoveDir !mingw_dir!\mingw64 !mingw_dir! || exit /B %ERRORLEVEL%
 )
 
@@ -335,44 +349,48 @@ call win_helpers.bat :FileHashCheck sha256 "!mingw_exe!" "!mingw_exe_sha256!" ||
 REM Terminal
 echo set PATH=!mingw_bin_dir!;%%PATH%%>> "!tmp_terminal_script!"
 
-REM ----------------------------------------------------------------------------
 REM ninja
 REM ----------------------------------------------------------------------------
 set ninja_sha256=bbde850d247d2737c5764c927d1071cbb1f1957dcabda4a130fa8547c12c695f
 set ninja_exe_sha256=6a71c03f88897419f19548a8eadd941ed94144bb671be289822080f991c1ab79
 set ninja_version=1.10.2
 
-set ninja_label=ninja_win64_!ninja_version!
-set ninja_zip=!downloads_dir!\!ninja_label!.zip
-set ninja_dir=!tools_dir!\!ninja_label!
+set ninja_download_name=ninja-win
+set ninja_download_file=!ninja_download_name!.zip
+set ninja_download_path=!downloads_dir!\!ninja_download_file!
+set ninja_download_url="https://github.com/ninja-build/ninja/releases/download/v!ninja_version!/!ninja_download_file!"
+
+set ninja_dir=!tools_dir!\ninja_win64_!ninja_version!
 set ninja_exe=!ninja_dir!\ninja.exe
 
 if not exist "!ninja_exe!" (
-    call win_helpers.bat :DownloadFile "https://github.com/ninja-build/ninja/releases/download/v!ninja_version!/ninja-win.zip" "!ninja_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!ninja_zip!" "!ninja_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!ninja_zip!" "!ninja_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!ninja_download_url!" "!ninja_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!ninja_download_path!" "!ninja_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!ninja_download_path!" "!ninja_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!ninja_exe!" "!ninja_exe_sha256!" || exit /B %ERRORLEVEL%
 call win_helpers.bat :MakeBatchShortcut "ninja" "!ninja_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
 
-REM ----------------------------------------------------------------------------
 REM nodejs
 REM ----------------------------------------------------------------------------
 set nodejs_sha256=f7b0e8b0bfcfad7d62eba16fa4db9f085983c12c661bd4c66d8e3bd783befa65
 set nodejs_exe_sha256=7f33cbe04cb2940427e6dd97867c1fcf3ddd60911d2ae0260da3cab9f6ea6365
 set nodejs_version=16.7.0
 
-set nodejs_label=nodejs_win64_!nodejs_version!
-set nodejs_zip=!downloads_dir!\!nodejs_label!.7z
-set nodejs_dir=!tools_dir!\!nodejs_label!
+set nodejs_download_name=node-v!nodejs_version!-win-x64
+set nodejs_download_file=!nodejs_download_name!.7z
+set nodejs_download_path=!downloads_dir!\!nodejs_download_file!
+set nodejs_download_url="https://nodejs.org/dist/v!nodejs_version!/!nodejs_download_file!"
+
+set nodejs_dir=!tools_dir!\nodejs_win64_!nodejs_version!
 set nodejs_exe=!nodejs_dir!\node.exe
 
 if not exist "!nodejs_exe!" (
-    call win_helpers.bat :DownloadFile "https://nodejs.org/dist/v!nodejs_version!/node-v!nodejs_version!-win-x64.7z" "!nodejs_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!nodejs_zip!" "!nodejs_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!nodejs_zip!" "!nodejs_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :MoveDir "!nodejs_dir!\node-v!nodejs_version!-win-x64" "!nodejs_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!nodejs_download_url!" "!nodejs_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!nodejs_download_path!" "!nodejs_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!nodejs_download_path!" "!nodejs_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir "!nodejs_dir!\!nodejs_download_name!" "!nodejs_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!nodejs_exe!" "!nodejs_exe_sha256!" || exit /B %ERRORLEVEL%
@@ -380,7 +398,6 @@ call win_helpers.bat :FileHashCheck sha256 "!nodejs_exe!" "!nodejs_exe_sha256!"
 REM Terminal
 echo set PATH=!nodejs_dir!;%%PATH%%>> "!tmp_terminal_script!"
 
-REM ----------------------------------------------------------------------------
 REM Python
 REM ----------------------------------------------------------------------------
 REM We use the shared installation of python since pynvim/greenlet does not work
@@ -395,12 +412,13 @@ set python_version_and_date=!python_version!+!python_date!
 set python_download_name=cpython-!python_version_and_date!-x86_64-pc-windows-msvc-shared-install_only
 set python_download_file=!python_download_name!.tar.gz
 set python_download_path=!downloads_dir!\!python_download_file!
+set python_download_url="https://github.com/indygreg/python-build-standalone/releases/download/!python_date!/!python_download_file!"
 
 set python_dir=!tools_dir!\cpython_win64_!python_version_and_date!
 set python_exe=!python_dir!\python.exe
 
 if not exist "!python_exe!" (
-    call win_helpers.bat :DownloadFile "https://github.com/indygreg/python-build-standalone/releases/download/!python_date!/!python_download_file!" "!python_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!python_download_url!" "!python_download_path!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :FileHashCheck sha256 "!python_download_path!" "!python_sha256!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :Unzip "!zip7_exe!" "!python_download_path!" "!downloads_dir!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :Unzip "!zip7_exe!" "!downloads_dir!\!python_download_name!.tar" "!python_dir!" || exit /B %ERRORLEVEL%
@@ -413,75 +431,77 @@ REM Terminal
 echo set PYTHONHOME=!python_dir!>> "!tmp_terminal_script!"
 echo set PATH=!python_dir!;%%PATH%%>> "!tmp_terminal_script!"
 
-REM ----------------------------------------------------------------------------
 REM RenderDoc
 REM ----------------------------------------------------------------------------
 set renderdoc_sha256=ed1c1228b8fc30e53d3560dbae9d7bf47b85e0e15e30e6f3e4f36173a74f77bc
 set renderdoc_exe_sha256=3b4874f1677f08e4c329696eaa8281b7ee86b16ad5679932a72085a3e7abc658
 set renderdoc_version=1.19
 
-set renderdoc_label=renderdoc_win64_!renderdoc_version!
-set renderdoc_zip=!downloads_dir!\!renderdoc_label!.zip
-set renderdoc_dir=!tools_dir!\!renderdoc_label!
+set renderdoc_download_name=RenderDoc_!renderdoc_version!_64
+set renderdoc_download_file=!renderdoc_download_name!.zip
+set renderdoc_download_path=!downloads_dir!\!renderdoc_download_file!
+set renderdoc_download_url="https://renderdoc.org/stable/!renderdoc_version!/!renderdoc_download_file!"
+
+set renderdoc_dir=!tools_dir!\renderdoc_win64_!renderdoc_version!
 set renderdoc_exe=!renderdoc_dir!\qrenderdoc.exe
 
 if not exist "!renderdoc_exe!" (
-    call win_helpers.bat :DownloadFile "https://renderdoc.org/stable/!renderdoc_version!/RenderDoc_!renderdoc_version!_64.zip" "!renderdoc_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!renderdoc_zip!" "!renderdoc_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!renderdoc_zip!" "!renderdoc_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :MoveDir "!renderdoc_dir!\RenderDoc_!renderdoc_version!_64" "!renderdoc_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!renderdoc_download_url!" "!renderdoc_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!renderdoc_download_path!" "!renderdoc_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!renderdoc_download_path!" "!renderdoc_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir "!renderdoc_dir!\!renderdoc_download_name!" "!renderdoc_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!renderdoc_exe!" "!renderdoc_exe_sha256!" || exit /B %ERRORLEVEL%
 
-REM ----------------------------------------------------------------------------
 REM Zeal
 REM ----------------------------------------------------------------------------
 set zeal_sha256=08e9992f620ba0a5ea348471d8ac9c85059e95eedd950118928be639746e3f94
 set zeal_exe_sha256=d1e687a33e117b6319210f40e2401b4a68ffeb0f33ef82f5fb6a31ce4514a423
 set zeal_version=0.6.1
 
-set zeal_label=zeal_win64_!zeal_version!
-set zeal_zip=!downloads_dir!\!zeal_label!.7z
-set zeal_dir=!tools_dir!\!zeal_label!
+set zeal_download_name=zeal-portable-!zeal_version!-windows-x64
+set zeal_download_file=!zeal_download_name!.7z
+set zeal_download_path=!downloads_dir!\!zeal_download_file!
+set zeal_download_url="https://github.com/zealdocs/zeal/releases/download/v!zeal_version!/!zeal_download_file!"
+
+set zeal_dir=!tools_dir!\zeal_win64_!zeal_version!
 set zeal_exe=!zeal_dir!\zeal.exe
 
 if not exist "!zeal_exe!" (
-    call win_helpers.bat :DownloadFile "https://github.com/zealdocs/zeal/releases/download/v!zeal_version!/zeal-portable-!zeal_version!-windows-x64.7z" "!zeal_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!zeal_zip!" "!zeal_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!zeal_zip!" "!zeal_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :MoveDir "!zeal_dir!\zeal-portable-!zeal_version!-windows-x64" "!zeal_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!zeal_download_url!" "!zeal_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!zeal_download_path!" "!zeal_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!zeal_download_path!" "!zeal_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir "!zeal_dir!\!zeal_download_name!" "!zeal_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!zeal_exe!" "!zeal_exe_sha256!" || exit /B %ERRORLEVEL%
 
-REM ----------------------------------------------------------------------------
 REM Zig
 REM ----------------------------------------------------------------------------
 set zig_sha256=443da53387d6ae8ba6bac4b3b90e9fef4ecbe545e1c5fa3a89485c36f5c0e3a2
 set zig_exe_sha256=63c2f819cfdb1a35cb954791fc0aa48910a42065a5e1c6ff89ee16775c75a112
 set zig_version=0.9.1
 
-set zig_download_ext=zip
-set zig_download_label=zig-windows-x86_64-!zig_version!
-set zig_download_file=!downloads_dir!\!zig_download_label!.!zig_download_ext!
+set zig_download_name=zig-windows-x86_64-!zig_version!
+set zig_download_file=!zig_download_name!.zip
+set zig_download_path=!downloads_dir!\!zig_download_file!
+set zig_download_url="https://ziglang.org/download/!zig_version!/!zig_download_file!"
 
-set zig_label=zig_win64_!zig_version!
-set zig_dir=!tools_dir!\!zig_label!
+set zig_dir=!tools_dir!\zig_win64_!zig_version!
 set zig_exe=!zig_dir!\zig.exe
 
 if not exist "!zig_exe!" (
-    call win_helpers.bat :DownloadFile "https://ziglang.org/download/!zig_version!/!zig_download_label!.!zig_download_ext!" "!zig_download_file!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!zig_download_file!" "!zig_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!zig_download_file!" "!zig_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :MoveDir "!zig_dir!\zig-windows-x86_64-!zig_version!" "!zig_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!zig_download_url!" "!zig_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!zig_download_path!" "!zig_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!zig_download_path!" "!zig_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir "!zig_dir!\!zig_download_name!" "!zig_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!zig_exe!" "!zig_exe_sha256!" || exit /B %ERRORLEVEL%
 call win_helpers.bat :MakeBatchShortcut "zig" "!zig_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
 call win_helpers.bat :MakeBatchShortcut "zig-!zig_version!" "!zig_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
 
-REM ----------------------------------------------------------------------------
 REM MSVC
 REM ----------------------------------------------------------------------------
 REM This depends on python, so it must be installed after it.
@@ -500,7 +520,6 @@ call !msvc_dir!\setup.bat
 REM Terminal
 echo call "!msvc_dir!\setup.bat">> "!tmp_terminal_script!"
 
-REM ----------------------------------------------------------------------------
 REM Symget
 REM ----------------------------------------------------------------------------
 set symget_git_hash=79b026f
@@ -526,7 +545,6 @@ if not exist "!symget_exe!" (
     popd
 )
 
-REM ----------------------------------------------------------------------------
 REM Odin
 REM ----------------------------------------------------------------------------
 set odin_git_hash=227ee0f
@@ -555,10 +573,8 @@ if not exist "!odin_exe!" (
 
 call win_helpers.bat :MakeBatchShortcut "odin" "!odin_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
 
-REM ----------------------------------------------------------------------------
 REM QoL/Tools
 REM ----------------------------------------------------------------------------
-REM ----------------------------------------------------------------------------
 REM clink - Bash style tab completion in terminal
 REM ----------------------------------------------------------------------------
 set clink_sha256=6FD44B1D085ABC8319108986C0E19B119D54BC84A753397D567A5F62950F0ACC
@@ -597,62 +613,68 @@ call !git_exe! -C !clink_completions_dir! checkout 9ab9342 || exit /B %ERRORLEVE
 REM Terminal Script
 echo set CLINK_PATH=!clink_completions_dir!>> "!tmp_terminal_script!
 
-REM ----------------------------------------------------------------------------
 REM Dependencies (Walker) - For DLL dependency management
 REM ----------------------------------------------------------------------------
 set dependencies_sha256=7d22dc00f1c09fd4415d48ad74d1cf801893e83b9a39944b0fce6dea7ceaea99
 set dependencies_exe_sha256=1737e5406128c3560bbb2bced3ac62d77998e592444f94b10cc0aa0bb1e617e6
 set dependencies_version=1.11.1
 
-set dependencies_label=dependencies_win64_!dependencies_version!
-set dependencies_zip=!downloads_dir!\!dependencies_label!.zip
-set dependencies_dir=!tools_dir!\!dependencies_label!
+set dependencies_download_name=Dependencies_x64_Release
+set dependencies_download_file=!dependencies_download_name!.zip
+set dependencies_download_path=!downloads_dir!\!dependencies_download_file!
+set dependencies_download_url="https://github.com/lucasg/Dependencies/releases/download/v!dependencies_version!/!dependencies_download_file!"
+
+set dependencies_dir=!tools_dir!\dependencies_win64_!dependencies_version!
 set dependencies_exe=!dependencies_dir!\DependenciesGui.exe
 
 if not exist "!dependencies_exe!" (
-    call win_helpers.bat :DownloadFile "https://github.com/lucasg/Dependencies/releases/download/v!dependencies_version!/Dependencies_x64_Release.zip" "!dependencies_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!dependencies_zip!" "!dependencies_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!dependencies_zip!" "!dependencies_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!dependencies_download_url!" "!dependencies_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!dependencies_download_path!" "!dependencies_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!dependencies_download_path!" "!dependencies_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!dependencies_exe!" "!dependencies_exe_sha256!" || exit /B %ERRORLEVEL%
 
-REM ----------------------------------------------------------------------------
 REM everything (void tools search program)
 REM ----------------------------------------------------------------------------
 set everything_sha256=656ff3946222048a5558160023da6fd8abc6fa9569f7ac1dff058410a3db6f28
 set everything_exe_sha256=8f853443c0b0e8c144315a27d1e8bf1595bd09cb364393226accfe105c0a2c85
 set everything_version=1.4.1.1015
 
-set everything_label=everything_win64_!everything_version!
-set everything_zip=!downloads_dir!\!everything_label!.zip
-set everything_dir=!tools_dir!\!everything_label!
+set everything_download_name=Everything-!everything_version!.x64
+set everything_download_file=!everything_download_name!.zip
+set everything_download_path=!downloads_dir!\!everything_download_file!
+set everything_download_url="https://www.voidtools.com/!everything_download_file!"
+
+set everything_dir=!tools_dir!\everything_win64_!everything_version!
 set everything_exe=!everything_dir!\everything.exe
 
 if not exist "!everything_exe!" (
-    call win_helpers.bat :DownloadFile "https://www.voidtools.com/Everything-!everything_version!.x64.zip" "!everything_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!everything_zip!" "!everything_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!everything_zip!" "!everything_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!everything_download_url!" "!everything_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!everything_download_path!" "!everything_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!everything_download_path!" "!everything_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!everything_exe!" "!everything_exe_sha256!" || exit /B %ERRORLEVEL%
 
-REM ----------------------------------------------------------------------------
 REM fzf
 REM ----------------------------------------------------------------------------
 set fzf_sha256=AB0ED3255564DF1A6643FF492EBC728C25F3DF9EAA5C11AC7A28CF661667412F
 set fzf_exe_sha256=C41293D9E632C5A3604AD863389C0BEC7AC2AD1E3C1F51B60EA2271A63BBB3D2
 set fzf_version=0.30.0
 
-set fzf_label=fzf_win64_!fzf_version!
-set fzf_zip=!downloads_dir!\!fzf_label!.zip
+set fzf_download_name=fzf-!fzf_version!-windows_amd64
+set fzf_download_file=!fzf_download_name!.zip
+set fzf_download_path=!downloads_dir!\!fzf_download_file!
+set fzf_download_url="https://github.com/junegunn/fzf/releases/download/!fzf_version!/!fzf_download_file!"
+
 set fzf_dir=!tools_dir!
 set fzf_exe=!fzf_dir!\fzf_win64_!fzf_version!.exe
 
 if not exist "!fzf_exe!" (
-    call win_helpers.bat :DownloadFile "https://github.com/junegunn/fzf/releases/download/!fzf_version!/fzf-!fzf_version!-windows_amd64.zip" "!fzf_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!fzf_zip!" "!fzf_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!fzf_zip!" "!fzf_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!fzf_download_url!" "!fzf_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!fzf_download_path!" "!fzf_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!fzf_download_path!" "!fzf_dir!" || exit /B %ERRORLEVEL%
     move /Y "!fzf_dir!\fzf.exe" "!fzf_exe!" 1>NUL || exit /B %ERRORLEVEL%
 )
 
@@ -664,45 +686,49 @@ REM Use FD for FZF to make it ultra fast
 echo set FZF_DEFAULT_OPTS=--multi --layout=reverse>> "!tmp_terminal_script!"
 echo set FZF_DEFAULT_COMMAND=fd --unrestricted>> "!tmp_terminal_script!"
 
-REM ----------------------------------------------------------------------------
 REM NVIM
 REM ----------------------------------------------------------------------------
 set nvim_sha256=a72a90e2897ea296b777c325a37c981a0b51e2fe0c8b8735e3366b65e958cddc
 set nvim_exe_sha256=E2B9B9C38EE169475EEAE4501278A36A93C7A4F08F6E5379CA65A166041B8DA8
 set nvim_version=0.7.0
 
-set nvim_label=nvim_win64_!nvim_version!
-set nvim_zip=!downloads_dir!\!nvim_label!.zip
-set nvim_dir=!tools_dir!\!nvim_label!
+set nvim_download_name=nvim-win64
+set nvim_download_file=!nvim_download_name!.zip
+set nvim_download_path=!downloads_dir!\!nvim_download_file!
+set nvim_download_url="https://github.com/neovim/neovim/releases/download/v!nvim_version!/!nvim_download_file!"
+
+set nvim_dir=!tools_dir!\nvim_win64_!nvim_version!
 set nvim_exe=!nvim_dir!\bin\nvim.exe
 
 if not exist "!nvim_exe!" (
-    call win_helpers.bat :DownloadFile "https://github.com/neovim/neovim/releases/download/v!nvim_version!/nvim-win64.zip" "!nvim_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!nvim_zip!" "!nvim_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!nvim_zip!" "!nvim_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :MoveDir "!nvim_dir!\nvim-win64" "!nvim_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!nvim_download_url!" "!nvim_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!nvim_download_path!" "!nvim_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!nvim_download_path!" "!nvim_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir "!nvim_dir!\!nvim_download_name!" "!nvim_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!nvim_exe!" "!nvim_exe_sha256!" || exit /B %ERRORLEVEL%
 call win_helpers.bat :MakeBatchShortcut "nvim" "!nvim_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
 call win_helpers.bat :MakeBatchShortcut "nvim-qt" "!nvim_dir!\bin\nvim-qt.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
 
-REM ----------------------------------------------------------------------------
 REM Neovide
 REM ----------------------------------------------------------------------------
 set neovide_sha256=D1DE20E0FCBF68CB4D85CD6F15691DFB77848DAFB97519F8E67E3036A2A7927D
 set neovide_exe_sha256=C0F6ED7ED8BAC4EE910267FA785DA698A581004EA45838BE401E3FBA18DD3234
 set neovide_version=0.9.0
 
-set neovide_label=neovide_win64_!neovide_version!
-set neovide_zip=!downloads_dir!\!neovide_label!.zip
+set neovide_download_name=neovide-windows
+set neovide_download_file=!neovide_download_name!.zip
+set neovide_download_path=!downloads_dir!\!neovide_download_file!
+set neovide_download_url="https://github.com/neovide/neovide/releases/download/!neovide_version!/!neovide_download_file!"
+
 set neovide_dir=!tools_dir!\
-set neovide_exe=!neovide_dir!\!neovide_label!.exe
+set neovide_exe=!neovide_dir!\neovide_win64_!neovide_version!.exe
 
 if not exist "!neovide_exe!" (
-    call win_helpers.bat :DownloadFile "https://github.com/neovide/neovide/releases/download/!neovide_version!/neovide-windows.zip" "!neovide_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!neovide_zip!" "!neovide_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!neovide_zip!" "!neovide_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!neovide_download_url!" "!neovide_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!neovide_download_path!" "!neovide_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!neovide_download_path!" "!neovide_dir!" || exit /B %ERRORLEVEL%
     move /Y "!neovide_dir!\neovide.exe" "!neovide_exe!" || exit /B %ERRORLEVEL%
 )
 
@@ -726,48 +752,51 @@ REM Install Python NVIM module, for :py3 support
 set PYTHONHOME=!python_dir!
 !python_dir!\python.exe -m pip install pynvim cmake-language-server
 
-REM ----------------------------------------------------------------------------
 REM ImHex
 REM ----------------------------------------------------------------------------
 set imhex_sha256=080f537d3ea58c002cc2112adbec1352144710b43764de9a1dc04f129d3a3343
 set imhex_exe_sha256=6a4b0e70bf7c78af074af0de2346164d9f5aec28ea224f9ee903412e1c774d95
 set imhex_version=1.17.0
 
-set imhex_label=imhex_win64_!imhex_version!
-set imhex_zip=!downloads_dir!\!imhex_label!.zip
-set imhex_dir=!tools_dir!\!imhex_label!
+set imhex_download_name=Windows.Portable.ZIP
+set imhex_download_file=!imhex_download_name!.zip
+set imhex_download_path=!downloads_dir!\!imhex_download_file!
+set imhex_download_url="https://github.com/WerWolv/ImHex/releases/download/v!imhex_version!/!imhex_download_url!"
+
+set imhex_dir=!tools_dir!\imhex_win64_!imhex_version!
 set imhex_exe=!imhex_dir!\imhex.exe
 
 if not exist "!imhex_exe!" (
-    call win_helpers.bat :DownloadFile "https://github.com/WerWolv/ImHex/releases/download/v!imhex_version!/Windows.Portable.ZIP.zip" "!imhex_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!imhex_zip!" "!imhex_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!imhex_zip!" "!imhex_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!imhex_download_url!" "!imhex_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!imhex_download_path!" "!imhex_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!imhex_download_path!" "!imhex_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!imhex_exe!" "!imhex_exe_sha256!" || exit /B %ERRORLEVEL%
 
-REM ----------------------------------------------------------------------------
 REM Keypirinha
 REM ----------------------------------------------------------------------------
 set keypirinha_sha256=d109a16e6a5cf311abf6d06bbe5b1be3b9ba323b79c32a168628189e10f102a5
 set keypirinha_exe_sha256=2d3adb36a04e9fdf94636c9ac5d4c2b754accbfaecd81f4ee7189c3c0edc8af1
 set keypirinha_version=2.26
 
-set keypirinha_label=keypirinha_win64_!keypirinha_version!
-set keypirinha_zip=!downloads_dir!\!keypirinha_label!.7z
-set keypirinha_dir=!tools_dir!\!keypirinha_label!
+set keypirinha_download_name=keypirinha-!keypirinha_version!-x64-portable
+set keypirinha_download_file=!keypirinha_download_name!.7z
+set keypirinha_download_path=!downloads_dir!\!keypirinha_download_file!
+set keypirinha_download_url="https://github.com/Keypirinha/Keypirinha/releases/download/v!keypirinha_version!/!keypirinha_download_file!"
+
+set keypirinha_dir=!tools_dir!\keypirinha_win64_!keypirinha_version!
 set keypirinha_exe=!keypirinha_dir!\keypirinha.exe
 
 if not exist "!keypirinha_exe!" (
-    call win_helpers.bat :DownloadFile "https://github.com/Keypirinha/Keypirinha/releases/download/v!keypirinha_version!/keypirinha-!keypirinha_version!-x64-portable.7z" "!keypirinha_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!keypirinha_zip!" "!keypirinha_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!keypirinha_zip!" "!keypirinha_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!keypirinha_download_url!" "!keypirinha_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!keypirinha_download_path!" "!keypirinha_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!keypirinha_download_path!" "!keypirinha_dir!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :MoveDir "!keypirinha_dir!\keypirinha" "!keypirinha_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!keypirinha_exe!" "!keypirinha_exe_sha256!" || exit /B %ERRORLEVEL%
 
-REM ----------------------------------------------------------------------------
 REM Misc Tools
 REM ----------------------------------------------------------------------------
 REM ctags: C/C++ code annotation generator
@@ -778,27 +807,28 @@ call win_helpers.bat :OverwriteCopy "!installer_dir!\win_scanmapset.exe"
 call win_helpers.bat :OverwriteCopy "!installer_dir!\win_uncap.exe"                                 "!bin_dir!\uncap.exe" || exit /B %ERRORLEVEL%
 call win_helpers.bat :OverwriteCopy "!installer_dir!\os_clang_format_style_file"                    "!home_dir!\_clang-format" || exit /B %ERRORLEVEL%
 
-REM ------------------------------------------------------------------------
 REM MobaXTerm
 REM ------------------------------------------------------------------------
 set mobaxterm_sha256=91f80537f12c2ad34a5eba99a285c149781c6d35a144a965ce3aea8a9bc6868c
 set mobaxterm_exe_sha256=1053c81b44018d6e6519a9c80d7413f7bb36e9f6e43b3da619b2229aa362a522
 set mobaxterm_version=21.2
 
-set mobaxterm_label=mobaxterm_win64_!mobaxterm_version!
-set mobaxterm_zip=!downloads_dir!\!mobaxterm_label!.zip
-set mobaxterm_dir=!tools_dir!\!mobaxterm_label!
+set mobaxterm_download_name=MobaXterm_Portable_v!mobaxterm_version!
+set mobaxterm_download_file=!mobaxterm_download_name!.zip
+set mobaxterm_download_path=!downloads_dir!\!mobaxterm_download_file!
+set mobaxterm_download_url="https://download.mobatek.net/2122021051924233/!mobaxterm_download_file!"
+
+set mobaxterm_dir=!tools_dir!\mobaxterm_win64_!mobaxterm_version!
 set mobaxterm_exe=!mobaxterm_dir!\MobaXterm_Personal_21.2.exe
 
 if not exist "!mobaxterm_exe!" (
-    call win_helpers.bat :DownloadFile "https://download.mobatek.net/2122021051924233/MobaXterm_Portable_v!mobaxterm_version!.zip" !mobaxterm_zip! || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 !mobaxterm_zip! !mobaxterm_sha256! || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" !mobaxterm_zip! !mobaxterm_dir! || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!mobaxterm_download_url!" !mobaxterm_download_path! || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 !mobaxterm_download_path! !mobaxterm_sha256! || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" !mobaxterm_download_path! !mobaxterm_dir! || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!mobaxterm_exe!" "!mobaxterm_exe_sha256!" || exit /B %ERRORLEVEL%
 
-REM ----------------------------------------------------------------------------
 REM O&O ShutUp10 (Privacy Tool for Windows)
 REM ----------------------------------------------------------------------------
 REM We don't do SHA256 here since we don't get a versioned URL, this can
@@ -811,43 +841,47 @@ if not exist "!oo_shutup_10_file!" (
     call win_helpers.bat :DownloadFile "https://dl5.oo-software.com/files/ooshutup10/OOSU10.exe" "!oo_shutup_10_file!" || exit /B %ERRORLEVEL%
 )
 
-REM ----------------------------------------------------------------------------
 REM ProcessHacker
 REM ----------------------------------------------------------------------------
 set process_hacker_sha256=c662b756324c9727760b4e921459d31a30f99cf8d3f24b64f4fcb3b29a26beb4
 set process_hacker_exe_sha256=22b1b8f080a41a07f23eae8ab0ad2e5f88d3c5af5d8c1cd1bb4f6856482e945c
 set process_hacker_version=3.0.4861
 
-set process_hacker_label=process_hacker_win64_!process_hacker_version!
-set process_hacker_zip=!downloads_dir!\!process_hacker_label!
-set process_hacker_dir=!tools_dir!\!process_hacker_label!
+set process_hacker_download_name=processhacker-!process_hacker_version!-bin
+set process_hacker_download_file=!process_hacker_download_name!.zip
+set process_hacker_download_path=!downloads_dir!\!process_hacker_download_file!
+set process_hacker_download_url="https://github.com/ProcessHackerRepoTool/nightly-builds-mirror/releases/download/v!process_hacker_version!/!process_hacker_download_file!"
+
+set process_hacker_dir=!tools_dir!\process_hacker_win64_!process_hacker_version!
 set process_hacker_exe=!process_hacker_dir!\64bit\ProcessHacker.exe
 
 if not exist "!process_hacker_exe!" (
-    call win_helpers.bat :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 %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!process_hacker_zip!" "!process_hacker_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!process_hacker_zip!" "!process_hacker_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!process_hacker_download_url!" "!process_hacker_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!process_hacker_download_path!" "!process_hacker_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!process_hacker_download_path!" "!process_hacker_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!process_hacker_exe!" "!process_hacker_exe_sha256!" || exit /B %ERRORLEVEL%
 
-REM ----------------------------------------------------------------------------
 REM ripgrep
 REM ----------------------------------------------------------------------------
 set rg_sha256=a47ace6f654c5ffa236792fc3ee3fefd9c7e88e026928b44da801acb72124aa8
 set rg_exe_sha256=ab5595a4f7a6b918cece0e7e22ebc883ead6163948571419a1dd5cd3c7f37972
 set rg_version=13.0.0
 
-set rg_label=ripgrep_win64_!rg_version!
-set rg_zip=!downloads_dir!\!rg_label!.zip
-set rg_dir=!tools_dir!\!rg_label!
+set rg_download_name=ripgrep-!rg_version!-x86_64-pc-windows-msvc
+set rg_download_file=!rg_download_name!.zip
+set rg_download_path=!downloads_dir!\!rg_download_file!
+set rg_download_url="https://github.com/BurntSushi/ripgrep/releases/download/!rg_version!/!ripgrep_download_file!"
+
+set rg_dir=!tools_dir!\ripgrep_win64_!rg_version!
 set rg_exe=!rg_dir!\rg.exe
 
 if not exist "!rg_exe!" (
-    call win_helpers.bat :DownloadFile "https://github.com/BurntSushi/ripgrep/releases/download/!rg_version!/ripgrep-!rg_version!-x86_64-pc-windows-msvc.zip" "!rg_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!rg_zip!" "!rg_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!rg_zip!" "!rg_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :MoveDir "!rg_dir!\ripgrep-!rg_version!-x86_64-pc-windows-msvc" "!rg_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!rg_download_url!" "!rg_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!rg_download_path!" "!rg_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!rg_download_path!" "!rg_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir "!rg_dir!\!rg_download_name!" "!rg_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!rg_exe!" "!rg_exe_sha256!" || exit /B %ERRORLEVEL%
@@ -855,22 +889,24 @@ call win_helpers.bat :FileHashCheck sha256 "!rg_exe!" "!rg_exe_sha256!" || exit
 REM Terminal
 echo set PATH=!rg_dir!;%%PATH%%>> "!tmp_terminal_script!"
 
-REM ----------------------------------------------------------------------------
 REM fd
 REM ----------------------------------------------------------------------------
 set fd_sha256=F21BC26C1AB6BDBE4FE43F87A20C792D4ABE629AE97C6F42B25AC8A042F5521F
 set fd_exe_sha256=764F31AC5B477707B51DAEC32458E4D66059BA0D17F03032B7CD0C0534703354
 set fd_version=8.4.0
 
-set fd_label=fd_win64_!fd_version!
-set fd_zip=!downloads_dir!\!fd_label!.zip
-set fd_dir=!tools_dir!\!fd_label!
+set fd_download_name=ripgrep-!fd_version!-x86_64-pc-windows-msvc
+set fd_download_file=!fd_download_name!.zip
+set fd_download_path=!downloads_dir!\!fd_download_file!
+set fd_download_url="https://github.com/sharkdp/fd/releases/download/!fd_version!/!fd_download_file!"
+
+set fd_dir=!tools_dir!\fd_win64_!fd_version!
 set fd_exe=!fd_dir!\fd.exe
 
 if not exist "!fd_exe!" (
-    call win_helpers.bat :DownloadFile "https://github.com/sharkdp/fd/releases/download/v!fd_version!/fd-v!fd_version!-x86_64-pc-windows-msvc.zip" "!fd_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!fd_zip!" "!fd_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!fd_zip!" "!fd_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!fd_download_url!" "!fd_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!fd_download_path!" "!fd_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!fd_download_path!" "!fd_dir!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :MoveDir "!fd_dir!\fd-v!fd_version!-x86_64-pc-windows-msvc" "!fd_dir!" || exit /B %ERRORLEVEL%
 )
 
@@ -879,78 +915,87 @@ call win_helpers.bat :FileHashCheck sha256 "!fd_exe!" "!fd_exe_sha256!" || exit
 REM Terminal
 echo set PATH=!fd_dir!;%%PATH%%>> "!tmp_terminal_script!"
 
-REM ----------------------------------------------------------------------------
 REM Ethereum
 REM ----------------------------------------------------------------------------
-REM ----------------------------------------------------------------------------
 REM geth
 REM ----------------------------------------------------------------------------
 set geth_md5=753cab189bd175d9fc6fea965ff7161b
 set geth_exe_sha256=7374e1c761f27a24a1d66299935b03b46ac354b6dc5f48505178d014a56f12df
 set geth_version=1.10.17-25c9b49f
 
-set geth_label=geth_win64_!geth_version!
-set geth_zip=!downloads_dir!\!geth_label!.zip
-set geth_dir=!tools_dir!\!geth_label!
+set geth_download_name=geth-windows-amd64-!geth_version!
+set geth_download_file=!geth_download_name!.zip
+set geth_download_path=!downloads_dir!\!geth_download_file!
+set geth_download_url="https://gethstore.blob.core.windows.net/builds/!geth_download_file!"
+
+set geth_dir=!tools_dir!\geth_win64_!geth_version!
 set geth_exe=!geth_dir!\geth.exe
 
+set geth_gpg_key_download_name=geth-windows-amd64-!geth_version!.zip
+set geth_gpg_key_download_file=!geth_gpg_key_download_name!.asc
+set geth_gpg_key_download_path=!downloads_dir!\!geth_gpg_key_download_file!
+set geth_gpg_key_download_url="https://gethstore.blob.core.windows.net/builds/!geth_gpg_key_download_file!"
+
 set geth_gpg_key=!installer_dir!\win_geth_windows_builder_gpg_key.asc
-set geth_gpg_sig=!geth_zip!.asc
 
 if not exist "!geth_exe!" (
-    call win_helpers.bat :DownloadFile "https://gethstore.blob.core.windows.net/builds/geth-windows-amd64-!geth_version!.zip" "!geth_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :DownloadFile "https://gethstore.blob.core.windows.net/builds/geth-windows-amd64-!geth_version!.zip.asc" "!geth_gpg_sig!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck md5 "!geth_zip!" "!geth_md5!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!geth_download_url!" "!geth_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!geth_gpg_key_download_url!" "!geth_gpg_key_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck md5 "!geth_download_path!" "!geth_md5!" || exit /B %ERRORLEVEL%
 
     gpg --import "!geth_gpg_key!" || exit /B %ERRORLEVEL%
-    gpg --verify "!geth_gpg_sig!" "!geth_zip!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!geth_zip!" "!geth_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :MoveDir "!geth_dir!\geth-windows-amd64-!geth_version!" "!geth_dir!"
+    gpg --verify "!geth_gpg_key_download_path!" "!geth_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!geth_download_path!" "!geth_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir "!geth_dir!\!geth_download_name!" "!geth_dir!"
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!geth_exe!" "!geth_exe_sha256!" || exit /B %ERRORLEVEL%
 call win_helpers.bat :MakeBatchShortcut "geth" "!geth_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
 
-REM ----------------------------------------------------------------------------
 REM remix_ide
 REM ----------------------------------------------------------------------------
 set remix_ide_sha256=E3736B66ECF30384B88FD4D626F788412C0117E18C4D26F2289469CD0E33752A
 set remix_ide_exe_sha256=BEE0A36255D16A9888BA421D95CFC3B672265790E70AE56924E27022E8A2BA0D
 set remix_ide_version=1.3.3
 
-set remix_ide_label=remix_ide_win64_!remix_ide_version!
-set remix_ide_zip=!downloads_dir!\!remix_ide_label!.zip
-set remix_ide_dir=!tools_dir!\!remix_ide_label!
+set remix_ide_download_name=Remix-IDE-!remix_ide_version!-win
+set remix_ide_download_file=!remix_ide_download_name!.zip
+set remix_ide_download_path=!downloads_dir!\!remix_ide_download_file!
+set remix_ide_download_url="https://github.com/ethereum/remix-desktop/releases/download/v!remix_ide_version!/!remix_ide_download_file!"
+
+set remix_ide_dir=!tools_dir!\remix_ide_win64_!remix_ide_version!
 set remix_ide_exe=!remix_ide_dir!\Remix IDE.exe
 
 if not exist "!remix_ide_exe!" (
-    call win_helpers.bat :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 %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!remix_ide_zip!" "!remix_ide_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!remix_ide_zip!" "!remix_ide_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!remix_ide_download_url!" "!remix_ide_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!remix_ide_download_path!" "!remix_ide_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!remix_ide_download_path!" "!remix_ide_dir!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!remix_ide_exe!" "!remix_ide_exe_sha256!" || exit /B %ERRORLEVEL%
 
-REM ----------------------------------------------------------------------------
 REM solidity
 REM ----------------------------------------------------------------------------
 set solidity_exe_sha256=70A5A7EAA9135D13BD036CA55735F489559368AF819C5810CFAF0315DF56AB53
 set solidity_version=0.8.14
 
-set solidity_label=solidity_win64_!solidity_version!
+set solidity_download_name=solc-windows
+set solidity_download_file=!solidity_download_name!.exe
+set solidity_download_path=!downloads_dir!\!solidity_download_file!
+set solidity_download_url="https://github.com/ethereum/solidity/releases/download/v!solidity_version!/!solidity_download_file!"
+
 set solidity_dir=!tools_dir!
-set solidity_exe=!solidity_dir!\!solidity_label!.exe
+set solidity_exe=!solidity_dir!\solidity_win64_!solidity_version!.exe
 
 if not exist "!solidity_exe!" (
     if not exist "!solidity_dir!" mkdir "!solidity_dir!"
-    call win_helpers.bat :DownloadFile "https://github.com/ethereum/solidity/releases/download/v!solidity_version!/solc-windows.exe" "!solidity_exe!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "" "!solidity_exe!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!solidity_exe!" "!solidity_exe_sha256!" || exit /B %ERRORLEVEL%
 call win_helpers.bat :MakeBatchShortcut "solc" "!solidity_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
 call win_helpers.bat :MakeBatchShortcut "solc-!solidity_version!" "!solidity_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
 
-REM ----------------------------------------------------------------------------
 REM Finish Terminal Script
 REM ----------------------------------------------------------------------------
 echo if exist "!tools_dir!\win_terminal_user_config.bat" call "!tools_dir!\win_terminal_user_config.bat">> "!tmp_terminal_script!"
@@ -958,7 +1003,6 @@ echo start "" /MAX "!wezterm_exe!">> "!tmp_terminal_script!"
 echo exit>> "!tmp_terminal_script!"
 move /Y !tmp_terminal_script! !terminal_script!
 
-REM ----------------------------------------------------------------------------
 REM Odin & Portable MSVC Work-around
 REM ----------------------------------------------------------------------------
 REM Odin uses J. Blow's Microsoft craziness SDK locator which relies on the
@@ -980,7 +1024,6 @@ echo.>>!odin_uninstall_workaround_script!
 echo [HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows Kits\Installed Roots]>>!odin_uninstall_workaround_script!
 echo "KitsRoot10"=->>!odin_uninstall_workaround_script!
 
-REM ----------------------------------------------------------------------------
 REM Background Application Scripts
 REM ----------------------------------------------------------------------------
 set bg_app_script=!tools_dir!\win_start_background_apps.bat
@@ -988,14 +1031,12 @@ echo @echo off> "!bg_app_script!"
 echo start "" "!everything_dir!\everything.exe">> "!bg_app_script!"
 echo start "" "!keypirinha_dir!\keypirinha.exe">> "!bg_app_script!"
 
-REM ----------------------------------------------------------------------------
 REM CTags Helper Script
 REM ----------------------------------------------------------------------------
 set ctags_file=!bin_dir!\ctags_cpp.bat
 echo @echo off> "!ctags_file!"
 echo ctags --c++-kinds=+p --fields=+iaS --extras=+q %%*>> !ctags_file!
 
-REM ----------------------------------------------------------------------------
 REM Finish
 REM ----------------------------------------------------------------------------
 echo - Setup complete. Launch !tools_dir!\win_terminal.bat [or restart Wezterm instance if you're updating an existing installation]

From 06f07e78910889c0eee0c8e2ba4d2d00c788dd9a Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Sun, 24 Jul 2022 11:33:51 +1000
Subject: [PATCH 12/41] windows stuff

---
 win_install.bat | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/win_install.bat b/win_install.bat
index 6118ea4..f92efe5 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -915,6 +915,28 @@ call win_helpers.bat :FileHashCheck sha256 "!fd_exe!" "!fd_exe_sha256!" || exit
 REM Terminal
 echo set PATH=!fd_dir!;%%PATH%%>> "!tmp_terminal_script!"
 
+REM wiztree
+REM ----------------------------------------------------------------------------
+set wiztree_sha256=066E270DE1E398CC8447428047628C241832D53839AAE9815443B486AFFD66C9
+set wiztree_exe_sha256=688a21f225af918c47b883a0d905922411a63cbe55785aa4fbc16af244c1fcdf
+set wiztree_version=4_08
+
+set wiztree_download_name=wiztree_!wiztree_version!_portable
+set wiztree_download_file=!wiztree_download_name!.zip
+set wiztree_download_path=!downloads_dir!\!wiztree_download_file!
+set wiztree_download_url="https://www.diskanalyzer.com/files/!wiztree_download_file!"
+
+set wiztree_dir=!tools_dir!\wiztree_win64_!wiztree_version!
+set wiztree_exe=!wiztree_dir!\wiztree64.exe
+
+if not exist "!wiztree_exe!" (
+    call win_helpers.bat :DownloadFile "!wiztree_download_url!" "!wiztree_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!wiztree_download_path!" "!wiztree_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!wiztree_download_path!" "!wiztree_dir!" || exit /B %ERRORLEVEL%
+)
+
+call win_helpers.bat :FileHashCheck sha256 "!wiztree_exe!" "!wiztree_exe_sha256!" || exit /B %ERRORLEVEL%
+
 REM Ethereum
 REM ----------------------------------------------------------------------------
 REM geth

From 345505f6f9a6c016d3bb24cdb4e9852fee136506 Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Thu, 28 Jul 2022 20:30:19 +1000
Subject: [PATCH 13/41] windows stuff

---
 win_install.bat | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/win_install.bat b/win_install.bat
index f92efe5..1da8b79 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -526,7 +526,7 @@ set symget_git_hash=79b026f
 set symget_dir=!tools_dir!\symget
 set symget_exe=!symget_dir!\symget.exe
 if not exist "!symget_dir!" (
-    call !git_exe! clone https://github.com/mmozeiko/symget.git !symget_dir! || exit /B %ERRORLEVEL%
+    call "!git_exe!" clone "https://github.com/mmozeiko/symget.git" "!symget_dir!" || exit /B %ERRORLEVEL%
 )
 
 REM Extract current git hash of the repository. Remove the last character as
@@ -535,8 +535,9 @@ for /F "tokens=1 USEBACKQ" %%F IN (`"!git_exe!" -C !symget_dir! rev-parse --shor
 set symget_curr_git_hash=!symget_curr_git_hash:~0,-1!
 
 if !symget_curr_git_hash! neq !symget_git_hash! (
-    call !git_exe! -C !symget_dir! checkout !symget_git_hash! || exit /B %ERRORLEVEL%
-    if exist !symget_exe! del /F !symget_exe!
+    call "!git_exe!" -C "!symget_dir!" fetch || exit /B %ERRORLEVEL%
+    call "!git_exe!" -C "!symget_dir!" checkout "!symget_git_hash!" || exit /B %ERRORLEVEL%
+    if exist "!symget_exe!" del /F "!symget_exe!"
 )
 
 if not exist "!symget_exe!" (
@@ -552,21 +553,24 @@ set odin_dir=!tools_dir!\odin_win64
 set odin_exe=!odin_dir!\odin.exe
 
 if not exist "!odin_dir!" (
-    call !git_exe! clone "https://github.com/odin-lang/odin.git" !odin_dir! || exit /B %ERRORLEVEL%
+    call "!git_exe!" clone "https://github.com/odin-lang/odin.git" "!odin_dir!" || exit /B %ERRORLEVEL%
 )
 
 REM Extract current git hash of the repository. Remove the last character as
 REM rev-parse has a trailing whitespace.
 for /F "tokens=1 USEBACKQ" %%F IN (`"!git_exe!" -C !odin_dir! rev-parse --short HEAD`) do ( SET odin_curr_git_hash=%%F )
 set odin_curr_git_hash=!odin_curr_git_hash:~0,-1!
+echo @@@@@ !odin_git_hash!
+echo XXXXX !odin_curr_git_hash!
 
-if !odin_curr_git_hash! neq !odin_git_hash! (
-    call !git_exe! -C !odin_dir! checkout !odin_git_hash! || exit /B %ERRORLEVEL%
-    if exist !odin_exe! del /F !odin_exe!
+if "!odin_curr_git_hash!" neq "!odin_git_hash!" (
+    call "!git_exe!" -C "!odin_dir!" fetch || exit /B %ERRORLEVEL%
+    call "!git_exe!" -C "!odin_dir!" checkout "!odin_git_hash!" || exit /B %ERRORLEVEL%
+    if exist "!odin_exe!" del /F "!odin_exe!"
 )
 
 if not exist "!odin_exe!" (
-    pushd !odin_dir!
+    pushd "!odin_dir!"
     call build.bat
     popd
 )

From f83b8b132c97e2cebcc32643054a7d7ed017f2cc Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Sun, 31 Jul 2022 22:12:29 +1000
Subject: [PATCH 14/41] windows stuff

---
 win_install.bat | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/win_install.bat b/win_install.bat
index 1da8b79..c50b56e 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -535,7 +535,7 @@ for /F "tokens=1 USEBACKQ" %%F IN (`"!git_exe!" -C !symget_dir! rev-parse --shor
 set symget_curr_git_hash=!symget_curr_git_hash:~0,-1!
 
 if !symget_curr_git_hash! neq !symget_git_hash! (
-    call "!git_exe!" -C "!symget_dir!" fetch || exit /B %ERRORLEVEL%
+    call "!git_exe!" -C "!symget_dir!" pull origin master || exit /B %ERRORLEVEL%
     call "!git_exe!" -C "!symget_dir!" checkout "!symget_git_hash!" || exit /B %ERRORLEVEL%
     if exist "!symget_exe!" del /F "!symget_exe!"
 )
@@ -548,7 +548,7 @@ if not exist "!symget_exe!" (
 
 REM Odin
 REM ----------------------------------------------------------------------------
-set odin_git_hash=227ee0f
+set odin_git_hash=a0135080b3d5004da6fd3ccc2ef34a7faea54245
 set odin_dir=!tools_dir!\odin_win64
 set odin_exe=!odin_dir!\odin.exe
 
@@ -560,11 +560,9 @@ REM Extract current git hash of the repository. Remove the last character as
 REM rev-parse has a trailing whitespace.
 for /F "tokens=1 USEBACKQ" %%F IN (`"!git_exe!" -C !odin_dir! rev-parse --short HEAD`) do ( SET odin_curr_git_hash=%%F )
 set odin_curr_git_hash=!odin_curr_git_hash:~0,-1!
-echo @@@@@ !odin_git_hash!
-echo XXXXX !odin_curr_git_hash!
 
 if "!odin_curr_git_hash!" neq "!odin_git_hash!" (
-    call "!git_exe!" -C "!odin_dir!" fetch || exit /B %ERRORLEVEL%
+    call "!git_exe!" -C "!odin_dir!" pull origin master || exit /B %ERRORLEVEL%
     call "!git_exe!" -C "!odin_dir!" checkout "!odin_git_hash!" || exit /B %ERRORLEVEL%
     if exist "!odin_exe!" del /F "!odin_exe!"
 )

From ddc95ccbab40b218744eac6aed6ddd0256a45474 Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Mon, 1 Aug 2022 15:15:44 +1000
Subject: [PATCH 15/41] windows stuff

---
 win_helpers.bat | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/win_helpers.bat b/win_helpers.bat
index d0db705..e859866 100644
--- a/win_helpers.bat
+++ b/win_helpers.bat
@@ -1,6 +1,6 @@
 @echo off
 setlocal EnableDelayedExpansion
-REM Win Helpers - Version 4
+REM Win Helpers - Version 5
 call %*
 goto exit
 
@@ -73,7 +73,7 @@ if not exist "!file!" (
 )
 
 REM Calculate hash
-for /F "tokens=2 delims= " %%c in ('powershell -NoLogo -NoProfile -NonInteractive Get-FileHash -algorithm !algorithm! \"!file!\" ') do ( set "actual=%%c" )
+for /F %%c in ('powershell -NoLogo -NoProfile -NonInteractive "Get-FileHash -algorithm !algorithm! \"!file!\" | Select-Object -ExpandProperty Hash "') do ( set "actual=%%c" )
 
 REM Verify Hash
 if /I "!expected!" neq "!actual!" (

From 4a6ae5f8ec6dc789ad2a5427610c18ca3abb57a4 Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Mon, 22 Aug 2022 22:19:33 +1000
Subject: [PATCH 16/41] doxygen

---
 win_install.bat | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/win_install.bat b/win_install.bat
index c50b56e..6db8a23 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -236,6 +236,28 @@ if not exist "!ctags_exe!" (
 call win_helpers.bat :FileHashCheck sha256 "!ctags_exe!" "!ctags_exe_sha256!" || exit /B %ERRORLEVEL%
 call win_helpers.bat :MakeBatchShortcut "ctags" "!ctags_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
 
+REM doxygen
+REM ----------------------------------------------------------------------------
+set doxygen_md5=266a2b66914d0d1d96cc97e9f740b74c
+set doxygen_exe_sha256=3CB4D89F2B3DB7EEC2B6797DC6B49CDFE9ADDA954575898895260F66F312D730
+set doxygen_version=1.9.4
+
+set doxygen_download_name=doxygen-!doxygen_version!.windows.x64.bin
+set doxygen_download_file=!doxygen_download_name!.zip
+set doxygen_download_path=!downloads_dir!\!doxygen_download_file!
+set doxygen_download_url="https://www.doxygen.nl/files/!doxygen_download_file!"
+
+set doxygen_dir=!tools_dir!\doxygen_win64_!doxygen_version!
+set doxygen_exe=!doxygen_dir!\doxygen.exe
+
+if not exist "!doxygen_exe!" (
+    call win_helpers.bat :DownloadFile "!doxygen_download_url!" "!doxygen_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck md5 "!doxygen_download_path!" "!doxygen_md5!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!doxygen_download_path!" "!doxygen_dir!" || exit /B %ERRORLEVEL%
+)
+call win_helpers.bat :FileHashCheck sha256 "!doxygen_exe!" "!doxygen_exe_sha256!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeBatchShortcut "doxygen" "!doxygen_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
+
 REM Git
 REM ----------------------------------------------------------------------------
 set git_sha256=bc030848e282d49e562ae2392a72501cf539322ad06ffe4cea8cf766f148dfe8

From 31ad7807a0110dc4bd52fa287e5b40ee6bc44653 Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Tue, 23 Aug 2022 22:12:39 +1000
Subject: [PATCH 17/41] stuff

---
 win_helpers.bat |  34 ++++++-
 win_install.bat | 258 ++++++++++++++++++++++++++++++++++--------------
 2 files changed, 215 insertions(+), 77 deletions(-)

diff --git a/win_helpers.bat b/win_helpers.bat
index e859866..50f7144 100644
--- a/win_helpers.bat
+++ b/win_helpers.bat
@@ -1,6 +1,6 @@
 @echo off
 setlocal EnableDelayedExpansion
-REM Win Helpers - Version 5
+REM Win Helpers - Version 10
 call %*
 goto exit
 
@@ -103,7 +103,7 @@ robocopy "!src!" "!dest!" /E /MOVE /MT /NP /NJS /NS /NC /NFL /NDL
 exit /B 0
 
 :MakeBatchShortcut
-REM call win_helpers.bat :MakeBatchShortcut <name> <src> <dest_dir>
+REM call win_helpers.bat :MakeBatchShortcut <name> <exe> <dest_dir>
 REM ------------------------------------------------------------------------------------------------
 REM NOTE we make a batch file instead of a symlink because symlinks require
 REM admin privileges in windows ...
@@ -112,13 +112,13 @@ set executable=%~2
 set dest_dir=%~3
 
 if not exist "!executable!" (
-    echo - [MakeBatchShortcut] Executable for shortcut does not exist [executable=%executable%]
-    exit /B %ERRORLEVEL%
+    echo - [MakeBatchShortcut] Executable for shortcut does not exist [exe=%executable%]
+    exit /B 1
 )
 
 if not exist "!dest_dir!" (
     echo - [MakeBatchShortcut] Shortcut destination directory does not exist [dir=%dest_dir%]
-    exit /B %ERRORLEVEL%
+    exit /B 1
 )
 
 echo - [MakeBatchShortcut] Create [name=!name!, exe=!executable!, dest=!dest_dir!]
@@ -126,5 +126,29 @@ echo @echo off> "!dest_dir!\!name!.bat"
 echo !executable! %%*>> "!dest_dir!\!name!.bat"
 exit /B 0
 
+:MakeRelativeBatchShortcut
+REM call win_helpers.bat :MakeRelativeBatchShortcut <name> <exe> <dest_dir>
+REM ------------------------------------------------------------------------------------------------
+REM NOTE we make a batch file instead of a symlink because symlinks require
+REM admin privileges in windows ...
+set name=%~1
+set executable=%~2
+set dest_dir=%~3
+
+if not exist "!dest_dir!\!executable!" (
+    echo - [MakeRelativeBatchShortcut] Executable for shortcut does not exist [exe=!dest_dir!\%executable%]
+    exit /B 1
+)
+
+if not exist "!dest_dir!" (
+    echo - [MakeRelativeBatchShortcut] Shortcut destination directory does not exist [dir=%dest_dir%]
+    exit /B 1
+)
+
+echo - [MakeRelativeBatchShortcut] Create [name=!name!, exe=!dest_dir!\!executable!, dest=!dest_dir!]
+echo @echo off> "!dest_dir!\!name!.bat"
+echo %%~dp0!executable! %%*>> "!dest_dir!\!name!.bat"
+exit /B 0
+
 :exit
 exit /B
diff --git a/win_install.bat b/win_install.bat
index 6db8a23..65aeee7 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -19,12 +19,12 @@ if not exist !bin_dir! mkdir !bin_dir!
 set tmp_terminal_script=!tools_dir!\win_terminal.bat.tmp
 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!"
-echo set USERPROFILE=!home_dir!>> "!tmp_terminal_script!"
-echo set APPDATA=!home_dir!\AppData>> "!tmp_terminal_script!"
-echo set LOCALAPPDATA=!home_dir!\AppData\Local>> "!tmp_terminal_script!"
-echo set PATH=!bin_dir!;%%PATH%%>> "!tmp_terminal_script!"
+echo set HOME=%%~dp0..\Home>> "!tmp_terminal_script!"
+echo set HOMEPATH=%%~dp0..\Home>> "!tmp_terminal_script!"
+echo set USERPROFILE=%%~dp0..\Home>> "!tmp_terminal_script!"
+echo set APPDATA=%%~dp0..\Home\AppData>> "!tmp_terminal_script!"
+echo set LOCALAPPDATA=%%~dp0..\Home\AppData\Local>> "!tmp_terminal_script!"
+echo set PATH=%%~dp0Binaries;%%PATH%%>> "!tmp_terminal_script!"
 
 REM Setup tools for setting up the development environment
 REM ----------------------------------------------------------------------------
@@ -74,7 +74,8 @@ set zip7_download_file=!zip7_download_name!.exe
 set zip7_download_path=!downloads_dir!\!zip7_download_file!
 set zip7_download_url="https://www.7-zip.org/a/!zip7_download_file!"
 
-set zip7_dir=!tools_dir!\7zip_win64_!zip7_version!
+set zip7_dir_name=7zip_win64_!zip7_version!
+set zip7_dir=!tools_dir!\!zip7_dir_name!
 set zip7_exe=!zip7_dir!\7z.exe
 
 if not exist "!zip7_exe!" (
@@ -86,7 +87,7 @@ if not exist "!zip7_exe!" (
 call win_helpers.bat :FileHashCheck sha256 "!zip7_exe!" "!zip7_exe_sha256!" || exit /B %ERRORLEVEL%
 
 REM Terminal
-echo set PATH=!zip7_dir!;%%PATH%%>> "!tmp_terminal_script!"
+echo set PATH=%%~dp0!zip7_dir_name!;%%PATH%%>> "!tmp_terminal_script!"
 
 REM GPG Signature Verification
 REM ----------------------------------------------------------------------------
@@ -100,7 +101,8 @@ set gpg_download_file=!gpg_download_name!.exe
 set gpg_download_path=!downloads_dir!\!gpg_download_file!
 set gpg_download_url="https://gnupg.org/ftp/gcrypt/binary/!gpg_download_file!"
 
-set gpg_w32_dir=!tools_dir!\gpg_win32_!gpg_w32_version!
+set gpg_w32_dir_name=gpg_win32_!gpg_w32_version!
+set gpg_w32_dir=!tools_dir!\!gpg_w32_dir_name!
 set gpg_w32_bin_dir=!gpg_w32_dir!\bin
 set gpg_w32_exe=!gpg_w32_bin_dir!\gpg.exe
 
@@ -114,7 +116,7 @@ call win_helpers.bat :FileHashCheck sha256 "!gpg_w32_exe!" "!gpg_w32_exe_sha256!
 set PATH="!gpg_w32_bin_dir!";!PATH!
 
 REM Terminal
-echo set PATH=!gpg_w32_bin_dir!;%%PATH%%>> "!tmp_terminal_script!"
+echo set PATH=%%~dp0!gpg_w32_dir_name!\bin;%%PATH%%>> "!tmp_terminal_script!"
 
 REM Application Setup
 REM ----------------------------------------------------------------------------
@@ -131,7 +133,8 @@ set wezterm_download_file=!wezterm_download_name!.zip
 set wezterm_download_path=!downloads_dir!\!wezterm_download_file!
 set wezterm_download_url="https://github.com/wez/wezterm/releases/download/!wezterm_version!/!wezterm_download_file!"
 
-set wezterm_dir=!tools_dir!\wezterm_win64_!wezterm_version!
+set wezterm_dir_name=wezterm_win64_!wezterm_version!
+set wezterm_dir=!tools_dir!\!wezterm_dir_name!
 set wezterm_exe=!wezterm_dir!\wezterm-gui.exe
 
 if not exist "!wezterm_exe!" (
@@ -195,7 +198,8 @@ for %%a in (%cmake_version_list%) do (
     set cmake_download_path=!downloads_dir!\!cmake_download_file!
     set cmake_download_url="https://github.com/Kitware/CMake/releases/download/v!cmake_version!/!cmake_download_file!"
 
-    set cmake_dir=!tools_dir!\cmake_win64_!cmake_version!
+    set cmake_dir_name=cmake_win64_!cmake_version!
+    set cmake_dir=!tools_dir!\!cmake_dir_name!
     set cmake_bin_dir=!cmake_dir!\bin
     set cmake_exe=!cmake_bin_dir!\cmake.exe
 
@@ -207,11 +211,9 @@ for %%a in (%cmake_version_list%) do (
     )
 
     call win_helpers.bat :FileHashCheck sha256 "!cmake_exe!" "!cmake_exe_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :MakeBatchShortcut "cmake-!cmake_version!" "!cmake_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MakeRelativeBatchShortcut "cmake-!cmake_version!" "..\!cmake_dir_name!\bin\cmake.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
 )
-
-call win_helpers.bat :MakeBatchShortcut "cmake" "!cmake_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
-echo set PATH=!cmake_bin_dir!;%%PATH%%>> "!tmp_terminal_script!"
+echo set PATH=%%~dp0!cmake_dir_name!\bin;%%PATH%%>> "!tmp_terminal_script!"
 
 REM ctags
 REM ----------------------------------------------------------------------------
@@ -224,7 +226,8 @@ set ctags_download_file=!ctags_download_name!.zip
 set ctags_download_path=!downloads_dir!\!ctags_download_file!
 set ctags_download_url="https://github.com/universal-ctags/ctags-win32/releases/download/!ctags_version!/!ctags_download_file!"
 
-set ctags_dir=!tools_dir!\ctags_win64_!ctags_version!
+set ctags_dir_name=ctags_win64_!ctags_version!
+set ctags_dir=!tools_dir!\!ctags_dir_name!
 set ctags_exe=!ctags_dir!\ctags.exe
 
 if not exist "!ctags_exe!" (
@@ -234,7 +237,7 @@ if not exist "!ctags_exe!" (
     call win_helpers.bat :MoveDir "!ctags_dir!/ctags-!ctags_version!-windows-x86_64" "!ctags_dir!" || exit /B %ERRORLEVEL%
 )
 call win_helpers.bat :FileHashCheck sha256 "!ctags_exe!" "!ctags_exe_sha256!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeBatchShortcut "ctags" "!ctags_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeRelativeBatchShortcut "ctags" "..\!ctags_dir_name!\ctags.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
 
 REM doxygen
 REM ----------------------------------------------------------------------------
@@ -247,7 +250,8 @@ set doxygen_download_file=!doxygen_download_name!.zip
 set doxygen_download_path=!downloads_dir!\!doxygen_download_file!
 set doxygen_download_url="https://www.doxygen.nl/files/!doxygen_download_file!"
 
-set doxygen_dir=!tools_dir!\doxygen_win64_!doxygen_version!
+set doxygen_dir_name=doxygen_win64_!doxygen_version!
+set doxygen_dir=!tools_dir!\!doxygen_dir_name!
 set doxygen_exe=!doxygen_dir!\doxygen.exe
 
 if not exist "!doxygen_exe!" (
@@ -256,7 +260,7 @@ if not exist "!doxygen_exe!" (
     call win_helpers.bat :Unzip "!zip7_exe!" "!doxygen_download_path!" "!doxygen_dir!" || exit /B %ERRORLEVEL%
 )
 call win_helpers.bat :FileHashCheck sha256 "!doxygen_exe!" "!doxygen_exe_sha256!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeBatchShortcut "doxygen" "!doxygen_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeRelativeBatchShortcut "doxygen" "..\!doxygen_dir_name!\doxygen.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
 
 REM Git
 REM ----------------------------------------------------------------------------
@@ -271,7 +275,8 @@ set git_download_url="https://github.com/git-for-windows/git/releases/download/v
 
 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_win64_!git_version!
+set git_install_dir_name=PortableGit_win64_!git_version!
+set git_install_dir=!tools_dir!\!git_install_dir_name!
 set git_exe=!git_install_dir!\cmd\git.exe
 
 if not exist "!git_exe!" (
@@ -283,9 +288,106 @@ if not exist "!git_exe!" (
 call win_helpers.bat :FileHashCheck sha256 "!git_exe!" "!git_exe_sha256!" || exit /B %ERRORLEVEL%
 
 REM Terminal
-echo set PATH=!git_install_dir!\cmd;%%PATH%%>> "!tmp_terminal_script!"
-echo set PATH=!git_install_dir!\mingw64\bin;%%PATH%%>> "!tmp_terminal_script!"
-echo set PATH=!git_install_dir!\usr\bin;%%PATH%%>> "!tmp_terminal_script!"
+echo set PATH=%%~dp0!git_install_dir_name!\cmd;%%PATH%%>> "!tmp_terminal_script!"
+echo set PATH=%%~dp0!git_install_dir_name!\mingw64\bin;%%PATH%%>> "!tmp_terminal_script!"
+echo set PATH=%%~dp0!git_install_dir_name!\usr\bin;%%PATH%%>> "!tmp_terminal_script!"
+
+REM GCC/MinGW for 32/64bit ARM
+REM ----------------------------------------------------------------------------
+set gcc_mingw_arm_version_list=12.2.0 !gcc_mingw_arm_version_list!
+set gcc_mingw_arm_version_list=11.3.0 !gcc_mingw_arm_version_list!
+set gcc_mingw_arm_version_list=10.3.0 !gcc_mingw_arm_version_list!
+
+set gcc_mingw_arm_arch_list=aarch64-none-elf !gcc_mingw_arm_arch_list!
+set gcc_mingw_arm_arch_list=arm-none-eabi !gcc_mingw_arm_arch_list!
+
+for %%a in (%gcc_mingw_arm_version_list%) do (
+    for %%b in (%gcc_mingw_arm_arch_list%) do (
+        set gcc_mingw_arm_version=%%a
+        set gcc_mingw_arm_arch=%%b
+        set gcc_mingw_arm_exe_sha256=none
+
+        if "!gcc_mingw_arm_arch!"=="aarch64-none-elf" (
+            if "!gcc_mingw_arm_version!"=="12.2.0" set gcc_mingw_arm_exe_sha256=A26BAFFA86BC3401790D682F13F9B321EA56153EAE7DD4F332BDE40A6B76FCB3
+            if "!gcc_mingw_arm_version!"=="11.3.0" set gcc_mingw_arm_exe_sha256=47EAEF0E603C9FCAE18F2EFADA305888503E878053119EDE3A9E0B8B8BEAC2EE
+            if "!gcc_mingw_arm_version!"=="10.3.0" set gcc_mingw_arm_exe_sha256=F2B2D3C6DAB0F84A151835540F25E6D6F9442D00BF546BC4C709FAD4B6FDDA06
+        ) else (
+            if "!gcc_mingw_arm_version!"=="12.2.0" set gcc_mingw_arm_exe_sha256=FA48985C43CF82B426C461381E4C50D0AC3E9425F7E97BF116E1BAB4B3A2A388
+            if "!gcc_mingw_arm_version!"=="11.3.0" set gcc_mingw_arm_exe_sha256=A36F2EA6846BADF7C91631F118E88967F25D6E479A9BEEA158445CE75403A655
+            if "!gcc_mingw_arm_version!"=="10.3.0" set gcc_mingw_arm_exe_sha256=C3DC49B561D177B3586992DFEA86067EB8799E1586A7F26CEA5B0EA97926632E
+        )
+
+        set gcc_mingw_arm_download_name=gcc-v!gcc_mingw_arm_version!-!gcc_mingw_arm_arch!
+        set gcc_mingw_arm_download_file=!gcc_mingw_arm_download_name!.7z
+        set gcc_mingw_arm_download_path=!downloads_dir!\!gcc_mingw_arm_download_file!
+        set gcc_mingw_arm_download_url="https://github.com/mmozeiko/build-gcc-arm/releases/download/gcc-v!gcc_mingw_arm_version!/!gcc_mingw_arm_download_file!"
+
+        set gcc_mingw_arm_dir_name=gcc_mingw_arm_win64_!gcc_mingw_arm_version!_!gcc_mingw_arm_arch!
+        set gcc_mingw_arm_dir=!tools_dir!\!gcc_mingw_arm_dir_name!
+        set gcc_mingw_arm_bin_dir=!gcc_mingw_arm_dir!\bin
+        set gcc_mingw_arm_exe=!gcc_mingw_arm_bin_dir!\!gcc_mingw_arm_arch!-g++.exe
+
+        if not exist "!gcc_mingw_arm_exe!" (
+            call win_helpers.bat :DownloadFile "!gcc_mingw_arm_download_url!" "!gcc_mingw_arm_download_path!" || exit /B %ERRORLEVEL%
+            call win_helpers.bat :Unzip "!zip7_exe!" "!gcc_mingw_arm_download_path!" "!gcc_mingw_arm_dir!" || exit /B %ERRORLEVEL%
+            call win_helpers.bat :MoveDir "!gcc_mingw_arm_dir!\gcc-v!gcc_mingw_arm_version!-!gcc_mingw_arm_arch!" !gcc_mingw_arm_dir! || exit /B %ERRORLEVEL%
+        )
+
+        call win_helpers.bat :FileHashCheck sha256 "!gcc_mingw_arm_exe!" "!gcc_mingw_arm_exe_sha256!" || exit /B %ERRORLEVEL%
+        call win_helpers.bat :MakeRelativeBatchShortcut "!gcc_mingw_arm_arch!-gcc-!gcc_mingw_arm_version!" "..\!gcc_mingw_arm_dir_name!\bin\!gcc_mingw_arm_arch!-gcc.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
+        call win_helpers.bat :MakeRelativeBatchShortcut "!gcc_mingw_arm_arch!-g++-!gcc_mingw_arm_version!" "..\!gcc_mingw_arm_dir_name!\bin\!gcc_mingw_arm_arch!-g++.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
+    )
+)
+
+REM GCC+MinGW
+REM ----------------------------------------------------------------------------
+set gcc_version_list=12.2.0 !gcc_version_list!
+set gcc_version_list=11.3.0 !gcc_version_list!
+set gcc_version_list=10.3.0 !gcc_version_list!
+
+for %%a in (%gcc_version_list%) do (
+    set gcc_version=%%a
+    set gcc_mingw_version=none
+    set gcc_exe_sha256=none
+
+    if "!gcc_version!"=="12.2.0" (
+        set gcc_mingw_version=10.0.0
+        set gcc_exe_sha256=886B0F25256DDBD0F4AD09E6E3B81279F9A8B6A1B5C32C714C9C201D802CAA39
+    )
+
+    if "!gcc_version!"=="11.3.0" (
+        set gcc_mingw_version=10.0.0
+        set gcc_exe_sha256=E92ECFA0171F2AB0C3CA39F2121AB5E887B3A378399A4BE7E056820F5841C7A5
+    )
+
+    if "!gcc_version!"=="10.3.0" (
+        set gcc_mingw_version=8.0.0
+        set gcc_exe_sha256=5C93B6DA129EA01EE5FC87D5C7DB948FC3BC62BAE261DED9A883F1FA543571D2
+    )
+
+    set gcc_download_name=gcc-v!gcc_version!-mingw-v!gcc_mingw_version!-x86_64
+    set gcc_download_file=!gcc_download_name!.7z
+    set gcc_download_path=!downloads_dir!\!gcc_download_file!
+    set gcc_download_url="https://github.com/mmozeiko/build-gcc/releases/download/gcc-v!gcc_version!-mingw-v!gcc_mingw_version!/!gcc_download_file!"
+
+    set gcc_dir_name=gcc_!gcc_version!_mingw_!gcc_mingw_version!_win64
+    set gcc_dir=!tools_dir!\!gcc_dir_name!
+    set gcc_bin_dir=!gcc_dir!\bin
+    set gcc_exe=!gcc_bin_dir!\g++.exe
+
+    if not exist "!gcc_exe!" (
+        call win_helpers.bat :DownloadFile "!gcc_download_url!" "!gcc_download_path!" || exit /B %ERRORLEVEL%
+        call win_helpers.bat :Unzip "!zip7_exe!" "!gcc_download_path!" "!gcc_dir!" || exit /B %ERRORLEVEL%
+        call win_helpers.bat :MoveDir "!gcc_dir!\gcc-v!gcc_version!-mingw-v!gcc_mingw_version!-x86_64" !gcc_dir! || exit /B %ERRORLEVEL%
+    )
+
+    call win_helpers.bat :FileHashCheck sha256 "!gcc_exe!" "!gcc_exe_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MakeRelativeBatchShortcut "gcc-!gcc_version!" "..\!gcc_dir_name!\bin\gcc.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MakeRelativeBatchShortcut "g++-!gcc_version!" "..\!gcc_dir_name!\bin\g++.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
+)
+
+REM Terminal
+echo set PATH=%%~dp0!gcc_dir_name!\bin;%%PATH%%>> "!tmp_terminal_script!"
 
 REM LLVM/Clang
 REM ----------------------------------------------------------------------------
@@ -311,7 +413,8 @@ for %%a in (%llvm_version_list%) do (
     set llvm_download_path=!downloads_dir!\!llvm_download_file!
     set llvm_download_url="https://github.com/llvm/llvm-project/releases/download/llvmorg-!llvm_version!/!llvm_download_file!"
 
-    set llvm_dir=!tools_dir!\llvm_win64_!llvm_version!
+    set llvm_dir_name=llvm_win64_!llvm_version!
+    set llvm_dir=!tools_dir!\!llvm_dir_name!
     set llvm_bin_dir=!llvm_dir!\bin
     set llvm_exe=!llvm_bin_dir!\clang.exe
 
@@ -332,9 +435,9 @@ for %%a in (%llvm_version_list%) do (
     )
 
     call win_helpers.bat :FileHashCheck sha256 "!llvm_exe!" "!llvm_exe_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :MakeBatchShortcut "clang-!llvm_version!" "!llvm_bin_dir!\clang.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :MakeBatchShortcut "clang++-!llvm_version!" "!llvm_bin_dir!\clang++.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :MakeBatchShortcut "clang-cl-!llvm_version!" "!llvm_bin_dir!\clang-cl.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MakeRelativeBatchShortcut "clang-!llvm_version!"    "..\!llvm_dir_name!\bin\clang.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MakeRelativeBatchShortcut "clang++-!llvm_version!"  "..\!llvm_dir_name!\bin\clang++.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MakeRelativeBatchShortcut "clang-cl-!llvm_version!" "..\!llvm_dir_name!\bin\clang-cl.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
 )
 
 REM Clang Format
@@ -342,7 +445,7 @@ set clang_format=!home_dir!\clang-format.py
 call win_helpers.bat :OverwriteCopy "!llvm_dir!\share\clang\clang-format.py" "!clang_format!" || exit /B %ERRORLEVEL%
 
 REM Terminal
-echo set PATH=!llvm_bin_dir!;%%PATH%%>> "!tmp_terminal_script!"
+echo set PATH=%%~dp0!llvm_dir_name!\bin;%%PATH%%>> "!tmp_terminal_script!"
 
 REM MinGW64
 REM ------------------------------------------------------------------------
@@ -355,7 +458,8 @@ set mingw_download_file=!mingw_download_name!.7z
 set mingw_download_path=!downloads_dir!\!mingw_download_file!
 set mingw_download_url="https://sourceforge.net/projects/mingw-w64/files/Toolchains targetting Win64/Personal Builds/mingw-builds/!mingw_version!/threads-posix/seh/!mingw_download_file!\"
 
-set mingw_dir=!tools_dir!\mingw64-posix-seg-rt_v6-rev0_win64_!mingw_version!
+set mingw_dir_name=mingw64-posix-seg-rt_v6-rev0_win64_!mingw_version!
+set mingw_dir=!tools_dir!\!mingw_dir_name!
 set mingw_bin_dir=!mingw_dir!\bin
 set mingw_exe=!mingw_bin_dir!\gcc.exe
 
@@ -368,9 +472,6 @@ if not exist "!mingw_exe!" (
 
 call win_helpers.bat :FileHashCheck sha256 "!mingw_exe!" "!mingw_exe_sha256!" || exit /B %ERRORLEVEL%
 
-REM Terminal
-echo set PATH=!mingw_bin_dir!;%%PATH%%>> "!tmp_terminal_script!"
-
 REM ninja
 REM ----------------------------------------------------------------------------
 set ninja_sha256=bbde850d247d2737c5764c927d1071cbb1f1957dcabda4a130fa8547c12c695f
@@ -382,7 +483,8 @@ set ninja_download_file=!ninja_download_name!.zip
 set ninja_download_path=!downloads_dir!\!ninja_download_file!
 set ninja_download_url="https://github.com/ninja-build/ninja/releases/download/v!ninja_version!/!ninja_download_file!"
 
-set ninja_dir=!tools_dir!\ninja_win64_!ninja_version!
+set ninja_dir_name=ninja_win64_!ninja_version!
+set ninja_dir=!tools_dir!\!ninja_dir_name!
 set ninja_exe=!ninja_dir!\ninja.exe
 
 if not exist "!ninja_exe!" (
@@ -392,7 +494,7 @@ if not exist "!ninja_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!ninja_exe!" "!ninja_exe_sha256!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeBatchShortcut "ninja" "!ninja_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeRelativeBatchShortcut "ninja" "..\!ninja_dir_name!\ninja.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
 
 REM nodejs
 REM ----------------------------------------------------------------------------
@@ -405,7 +507,8 @@ set nodejs_download_file=!nodejs_download_name!.7z
 set nodejs_download_path=!downloads_dir!\!nodejs_download_file!
 set nodejs_download_url="https://nodejs.org/dist/v!nodejs_version!/!nodejs_download_file!"
 
-set nodejs_dir=!tools_dir!\nodejs_win64_!nodejs_version!
+set nodejs_dir_name=nodejs_win64_!nodejs_version!
+set nodejs_dir=!tools_dir!\!nodejs_dir_name!
 set nodejs_exe=!nodejs_dir!\node.exe
 
 if not exist "!nodejs_exe!" (
@@ -418,7 +521,7 @@ if not exist "!nodejs_exe!" (
 call win_helpers.bat :FileHashCheck sha256 "!nodejs_exe!" "!nodejs_exe_sha256!" || exit /B %ERRORLEVEL%
 
 REM Terminal
-echo set PATH=!nodejs_dir!;%%PATH%%>> "!tmp_terminal_script!"
+echo set PATH=%%~dp0!nodejs_dir_name!;%%PATH%%>> "!tmp_terminal_script!"
 
 REM Python
 REM ----------------------------------------------------------------------------
@@ -436,7 +539,8 @@ set python_download_file=!python_download_name!.tar.gz
 set python_download_path=!downloads_dir!\!python_download_file!
 set python_download_url="https://github.com/indygreg/python-build-standalone/releases/download/!python_date!/!python_download_file!"
 
-set python_dir=!tools_dir!\cpython_win64_!python_version_and_date!
+set python_dir_name=cpython_win64_!python_version_and_date!
+set python_dir=!tools_dir!\!python_dir_name!
 set python_exe=!python_dir!\python.exe
 
 if not exist "!python_exe!" (
@@ -450,8 +554,8 @@ if not exist "!python_exe!" (
 call win_helpers.bat :FileHashCheck sha256 "!python_exe!" "!python_exe_sha256!" || exit /B %ERRORLEVEL%
 
 REM Terminal
-echo set PYTHONHOME=!python_dir!>> "!tmp_terminal_script!"
-echo set PATH=!python_dir!;%%PATH%%>> "!tmp_terminal_script!"
+echo set PYTHONHOME=%%~dp0!python_dir_name!>> "!tmp_terminal_script!"
+echo set PATH=%%~dp0!python_dir_name!;%%PATH%%>> "!tmp_terminal_script!"
 
 REM RenderDoc
 REM ----------------------------------------------------------------------------
@@ -510,7 +614,8 @@ set zig_download_file=!zig_download_name!.zip
 set zig_download_path=!downloads_dir!\!zig_download_file!
 set zig_download_url="https://ziglang.org/download/!zig_version!/!zig_download_file!"
 
-set zig_dir=!tools_dir!\zig_win64_!zig_version!
+set zig_dir_name=zig_win64_!zig_version!
+set zig_dir=!tools_dir!\!zig_dir_name!
 set zig_exe=!zig_dir!\zig.exe
 
 if not exist "!zig_exe!" (
@@ -521,15 +626,16 @@ if not exist "!zig_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!zig_exe!" "!zig_exe_sha256!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeBatchShortcut "zig" "!zig_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeBatchShortcut "zig-!zig_version!" "!zig_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeRelativeBatchShortcut "zig"               "..\!zig_dir_name!\zig.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeRelativeBatchShortcut "zig-!zig_version!" "..\!zig_dir_name!\zig.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
 
 REM MSVC
 REM ----------------------------------------------------------------------------
 REM This depends on python, so it must be installed after it.
 set msvc_version=14.32
 set msvc_sdk_version=22621
-set msvc_dir=!tools_dir!\msvc_win64_!msvc_version!_win10_sdk_!msvc_sdk_version!
+set msvc_dir_name=msvc_win64_!msvc_version!_win10_sdk_!msvc_sdk_version!
+set msvc_dir=!tools_dir!\!msvc_dir_name!
 if not exist "!msvc_dir!" (
     call "!python_exe!" !installer_dir!\win_portable-msvc.py --accept-license --msvc-version !msvc_version! --sdk-version !msvc_sdk_version! || exit /B %ERRORLEVEL%
     call win_helpers.bat :MoveDir "msvc" "!msvc_dir!" || exit /B %ERRORLEVEL%
@@ -540,7 +646,7 @@ REM demand in this script.
 call !msvc_dir!\setup.bat
 
 REM Terminal
-echo call "!msvc_dir!\setup.bat">> "!tmp_terminal_script!"
+echo call "%%~dp0!msvc_dir_name!\setup.bat">> "!tmp_terminal_script!"
 
 REM Symget
 REM ----------------------------------------------------------------------------
@@ -570,8 +676,9 @@ if not exist "!symget_exe!" (
 
 REM Odin
 REM ----------------------------------------------------------------------------
-set odin_git_hash=a0135080b3d5004da6fd3ccc2ef34a7faea54245
-set odin_dir=!tools_dir!\odin_win64
+set odin_git_hash=7fe36de
+set odin_dir_name=odin_win64
+set odin_dir=!tools_dir!\!odin_dir_name!
 set odin_exe=!odin_dir!\odin.exe
 
 if not exist "!odin_dir!" (
@@ -595,7 +702,7 @@ if not exist "!odin_exe!" (
     popd
 )
 
-call win_helpers.bat :MakeBatchShortcut "odin" "!odin_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeRelativeBatchShortcut "odin" "..\!odin_dir_name!\odin.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
 
 REM QoL/Tools
 REM ----------------------------------------------------------------------------
@@ -611,9 +718,9 @@ set clink_download_file=!clink_download_name!.zip
 set clink_download_path=!downloads_dir!\!clink_download_file!
 set clink_download_url="https://github.com/chrisant996/clink/releases/download/v!clink_version!/!clink_download_file!"
 
-set clink_dir=!tools_dir!\clink_win64_!clink_version!
+set clink_dir_name=clink_win64_!clink_version!
+set clink_dir=!tools_dir!\!clink_dir_name!
 set clink_exe=!clink_dir!\clink_x64.exe
-set clink_bat=!clink_dir!\clink.bat
 
 if not exist "!clink_exe!" (
     call win_helpers.bat :DownloadFile "!clink_download_url!" "!clink_download_path!" || exit /B %ERRORLEVEL%
@@ -624,10 +731,11 @@ if not exist "!clink_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!clink_exe!" "!clink_exe_sha256!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeBatchShortcut "clink" "!clink_bat!" "!bin_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeRelativeBatchShortcut "clink" "..\!clink_dir_name!\clink.bat" "!bin_dir!" || exit /B %ERRORLEVEL%
 
 REM Clink Completion Addon
-set clink_completions_dir=!tools_dir!\clink-completions
+set clink_completions_dir_name=clink-completions
+set clink_completions_dir=!tools_dir!\!clink_completions_dir_name!
 if not exist "!clink_completions_dir!" (
     call !git_exe! clone https://github.com/vladimir-kotikov/clink-completions !clink_completions_dir! || exit /B %ERRORLEVEL%
 )
@@ -635,7 +743,7 @@ call !git_exe! -C !clink_completions_dir! pull origin master || exit /B %ERRORLE
 call !git_exe! -C !clink_completions_dir! checkout 9ab9342 || exit /B %ERRORLEVEL%
 
 REM Terminal Script
-echo set CLINK_PATH=!clink_completions_dir!>> "!tmp_terminal_script!
+echo set CLINK_PATH=%%~dp0!clink_completions_dir_name!>> "!tmp_terminal_script!
 
 REM Dependencies (Walker) - For DLL dependency management
 REM ----------------------------------------------------------------------------
@@ -670,7 +778,8 @@ set everything_download_file=!everything_download_name!.zip
 set everything_download_path=!downloads_dir!\!everything_download_file!
 set everything_download_url="https://www.voidtools.com/!everything_download_file!"
 
-set everything_dir=!tools_dir!\everything_win64_!everything_version!
+set everything_dir_name=everything_win64_!everything_version!
+set everything_dir=!tools_dir!\!everything_dir_name!
 set everything_exe=!everything_dir!\everything.exe
 
 if not exist "!everything_exe!" (
@@ -703,7 +812,7 @@ if not exist "!fzf_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!fzf_exe!" "!fzf_exe_sha256!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeBatchShortcut "fzf" "!fzf_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeRelativeBatchShortcut "fzf" "..\fzf_win64_!fzf_version!.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
 
 REM Terminal
 REM Use FD for FZF to make it ultra fast
@@ -721,7 +830,8 @@ set nvim_download_file=!nvim_download_name!.zip
 set nvim_download_path=!downloads_dir!\!nvim_download_file!
 set nvim_download_url="https://github.com/neovim/neovim/releases/download/v!nvim_version!/!nvim_download_file!"
 
-set nvim_dir=!tools_dir!\nvim_win64_!nvim_version!
+set nvim_dir_name=nvim_win64_!nvim_version!
+set nvim_dir=!tools_dir!\!nvim_dir_name!
 set nvim_exe=!nvim_dir!\bin\nvim.exe
 
 if not exist "!nvim_exe!" (
@@ -732,8 +842,8 @@ if not exist "!nvim_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!nvim_exe!" "!nvim_exe_sha256!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeBatchShortcut "nvim" "!nvim_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeBatchShortcut "nvim-qt" "!nvim_dir!\bin\nvim-qt.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeRelativeBatchShortcut "nvim"    "..\!nvim_dir_name!\bin\nvim.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeRelativeBatchShortcut "nvim-qt" "..\!nvim_dir_name!\bin\nvim-qt.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
 
 REM Neovide
 REM ----------------------------------------------------------------------------
@@ -757,7 +867,7 @@ if not exist "!neovide_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!neovide_exe!" "!neovide_exe_sha256!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeBatchShortcut "neovide" "!neovide_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeRelativeBatchShortcut "neovide" "..\neovide_win64_!neovide_version!.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
 
 REM Vim Configuration
 REM ----------------------------------------------------------------------------
@@ -809,7 +919,8 @@ set keypirinha_download_file=!keypirinha_download_name!.7z
 set keypirinha_download_path=!downloads_dir!\!keypirinha_download_file!
 set keypirinha_download_url="https://github.com/Keypirinha/Keypirinha/releases/download/v!keypirinha_version!/!keypirinha_download_file!"
 
-set keypirinha_dir=!tools_dir!\keypirinha_win64_!keypirinha_version!
+set keypirinha_dir_name=keypirinha_win64_!keypirinha_version!
+set keypirinha_dir=!tools_dir!\!keypirinha_dir_name!
 set keypirinha_exe=!keypirinha_dir!\keypirinha.exe
 
 if not exist "!keypirinha_exe!" (
@@ -898,7 +1009,8 @@ set rg_download_file=!rg_download_name!.zip
 set rg_download_path=!downloads_dir!\!rg_download_file!
 set rg_download_url="https://github.com/BurntSushi/ripgrep/releases/download/!rg_version!/!ripgrep_download_file!"
 
-set rg_dir=!tools_dir!\ripgrep_win64_!rg_version!
+set rg_dir_name=ripgrep_win64_!rg_version!
+set rg_dir=!tools_dir!\!rg_dir_name!
 set rg_exe=!rg_dir!\rg.exe
 
 if not exist "!rg_exe!" (
@@ -911,7 +1023,7 @@ if not exist "!rg_exe!" (
 call win_helpers.bat :FileHashCheck sha256 "!rg_exe!" "!rg_exe_sha256!" || exit /B %ERRORLEVEL%
 
 REM Terminal
-echo set PATH=!rg_dir!;%%PATH%%>> "!tmp_terminal_script!"
+echo set PATH=%%~dp0!rg_dir_name!;%%PATH%%>> "!tmp_terminal_script!"
 
 REM fd
 REM ----------------------------------------------------------------------------
@@ -924,7 +1036,8 @@ set fd_download_file=!fd_download_name!.zip
 set fd_download_path=!downloads_dir!\!fd_download_file!
 set fd_download_url="https://github.com/sharkdp/fd/releases/download/!fd_version!/!fd_download_file!"
 
-set fd_dir=!tools_dir!\fd_win64_!fd_version!
+set fd_dir_name=fd_win64_!fd_version!
+set fd_dir=!tools_dir!\!fd_dir_name!
 set fd_exe=!fd_dir!\fd.exe
 
 if not exist "!fd_exe!" (
@@ -937,7 +1050,7 @@ if not exist "!fd_exe!" (
 call win_helpers.bat :FileHashCheck sha256 "!fd_exe!" "!fd_exe_sha256!" || exit /B %ERRORLEVEL%
 
 REM Terminal
-echo set PATH=!fd_dir!;%%PATH%%>> "!tmp_terminal_script!"
+echo set PATH=%%~dp0!fd_dir_name!;%%PATH%%>> "!tmp_terminal_script!"
 
 REM wiztree
 REM ----------------------------------------------------------------------------
@@ -974,7 +1087,8 @@ set geth_download_file=!geth_download_name!.zip
 set geth_download_path=!downloads_dir!\!geth_download_file!
 set geth_download_url="https://gethstore.blob.core.windows.net/builds/!geth_download_file!"
 
-set geth_dir=!tools_dir!\geth_win64_!geth_version!
+set geth_dir_name=geth_win64_!geth_version!
+set geth_dir=!tools_dir!\!geth_dir_name!
 set geth_exe=!geth_dir!\geth.exe
 
 set geth_gpg_key_download_name=geth-windows-amd64-!geth_version!.zip
@@ -996,7 +1110,7 @@ if not exist "!geth_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!geth_exe!" "!geth_exe_sha256!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeBatchShortcut "geth" "!geth_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeRelativeBatchShortcut "geth" "..\!geth_dir_name!\geth.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
 
 REM remix_ide
 REM ----------------------------------------------------------------------------
@@ -1039,13 +1153,13 @@ if not exist "!solidity_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!solidity_exe!" "!solidity_exe_sha256!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeBatchShortcut "solc" "!solidity_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeBatchShortcut "solc-!solidity_version!" "!solidity_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeRelativeBatchShortcut "solc" "..\solidity_win64_!solidity_version!.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeRelativeBatchShortcut "solc-!solidity_version!" "..\solidity_win64_!solidity_version!.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
 
 REM Finish Terminal Script
 REM ----------------------------------------------------------------------------
-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 if exist "%%~dp0win_terminal_user_config.bat" call "%%~dp0win_terminal_user_config.bat">> "!tmp_terminal_script!"
+echo start "" /MAX "%%~dp0!wezterm_dir_name!\wezterm-gui.exe">> "!tmp_terminal_script!"
 echo exit>> "!tmp_terminal_script!"
 move /Y !tmp_terminal_script! !terminal_script!
 
@@ -1074,8 +1188,8 @@ REM Background Application Scripts
 REM ----------------------------------------------------------------------------
 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!"
+echo start "" "%%~dp0!everything_dir_name!\everything.exe">> "!bg_app_script!"
+echo start "" "%%~dp0!keypirinha_dir_name!\keypirinha.exe">> "!bg_app_script!"
 
 REM CTags Helper Script
 REM ----------------------------------------------------------------------------

From e8989c5da1efc7219d9b81360d1ecc62e3a8db03 Mon Sep 17 00:00:00 2001
From: doyle <doyle.thai@aosgrp.com>
Date: Tue, 30 Aug 2022 11:50:27 +1000
Subject: [PATCH 18/41] linux stuff

---
 linux_install.sh | 140 +++++++++++++++++++++++++++++------------------
 1 file changed, 88 insertions(+), 52 deletions(-)

diff --git a/linux_install.sh b/linux_install.sh
index 41a4a7b..fb3c261 100755
--- a/linux_install.sh
+++ b/linux_install.sh
@@ -65,15 +65,18 @@ cmake_sha256=aaced6f745b86ce853661a595bdac6c5314a60f8181b6912a0a4920acfa32708
 cmake_exe_sha256=95b80ba2b97b619abce1ed6fd28fe189cacba48403e9c69256f2f94e3405e645
 cmake_version=3.23.2
 
+cmake_download_name=cmake-${cmake_version}-linux-x86_64
+cmake_download_file=${cmake_download_name}.tar.gz
+cmake_download_path=${downloads_dir}/${cmake_download_file}
+
 cmake_label=cmake_linux64_${cmake_version}
-cmake_download_file=${downloads_dir}/${cmake_label}.tar.gz
 cmake_dir=${tools_dir}/${cmake_label}
 cmake_exe=${cmake_dir}/bin/cmake
 
 if [[ ! -f "${cmake_exe}" ]]; then
-    DownloadFile "https://github.com/Kitware/CMake/releases/download/v${cmake_version}/cmake-${cmake_version}-linux-x86_64.tar.gz" "${cmake_download_file}" || exit
-    FileSHA256Check "${cmake_download_file}" "${cmake_sha256}" || exit
-    mkdir --parents "${cmake_dir}" && tar xf "${cmake_download_file}" --skip-old-files --directory="${cmake_dir}" || exit
+    DownloadFile "https://github.com/Kitware/CMake/releases/download/v${cmake_version}/${cmake_download_file}" "${cmake_download_path}" || exit
+    FileSHA256Check "${cmake_download_path}" "${cmake_sha256}" || exit
+    mkdir --parents "${cmake_dir}" && tar xf "${cmake_download_path}" --skip-old-files --directory="${cmake_dir}" || exit
     mv ${cmake_dir}/cmake-${cmake_version}-linux-x86_64/* "${cmake_dir}" || exit
     rm --recursive ${cmake_dir}/cmake-${cmake_version}-linux-x86_64 || exit
 fi
@@ -89,18 +92,19 @@ fd_sha256=a1e72cf4f4fbd1b061387569678f3ab3555ee1cf025280b3ce6b2eee96cd3210
 fd_exe_sha256=057bea03a6f17eb99ea3b11c25a110880b012d2d5110988e80b1ce2ee6536342
 fd_version=8.4.0
 
-fd_label=fd_linux64_${fd_version}
-fd_download_label=fd-v${fd_version}-x86_64-unknown-linux-gnu
-fd_download_file=${downloads_dir}/${fd_download_label}.tar.gz
-fd_dir=${tools_dir}/${fd_label}
+fd_download_name=fd-v${fd_version}-x86_64-unknown-linux-gnu
+fd_download_file=${fd_download_name}.tar.gz
+fd_download_path=${downloads_dir}/${fd_download_file}
+
+fd_dir=${tools_dir}/fd_linux64_${fd_version}
 fd_exe=${fd_dir}/fd
 
 if [[ ! -f "${fd_exe}" ]]; then
-    DownloadFile "https://github.com/sharkdp/fd/releases/download/v${fd_version}/${fd_download_label}.tar.gz" "${fd_download_file}" || exit
-    FileSHA256Check "${fd_download_file}" "${fd_sha256}" || exit
-    mkdir --parents "${fd_dir}" && tar xf "${fd_download_file}" --skip-old-files --directory="${fd_dir}" || exit
-    mv ${fd_dir}/${fd_download_label}/* "${fd_dir}" || exit
-    rm --recursive ${fd_dir}/${fd_download_label} || exit
+    DownloadFile "https://github.com/sharkdp/fd/releases/download/v${fd_version}/${fd_download_file}" "${fd_download_path}" || exit
+    FileSHA256Check "${fd_download_path}" "${fd_sha256}" || exit
+    mkdir --parents "${fd_dir}" && tar xf "${fd_download_path}" --skip-old-files --directory="${fd_dir}" || exit
+    mv ${fd_dir}/${fd_download_name}/* "${fd_dir}" || exit
+    rm --recursive ${fd_dir}/${fd_download_name} || exit
 fi
 
 FileSHA256Check "${fd_exe}" "${fd_exe_sha256}" || exit
@@ -149,37 +153,39 @@ for llvm_version in ${llvm_version_list[@]}; do
     if [[ "${llvm_version}" == "14.0.0" ]]; then
         llvm_sha256=61582215dafafb7b576ea30cc136be92c877ba1f1c31ddbbd372d6d65622fef5
         llvm_exe_sha256=3557c2deadae7e2bc3bffce4afd93ddab6ef50090971c8ce3bf15c80b27134a0
-        llvm_download_label=clang+llvm-${llvm_version}-x86_64-linux-gnu-ubuntu-18.04
+        llvm_download_name=clang+llvm-${llvm_version}-x86_64-linux-gnu-ubuntu-18.04
     elif [[ "${llvm_version}" == "13.0.1" ]]; then
         llvm_sha256=84a54c69781ad90615d1b0276a83ff87daaeded99fbc64457c350679df7b4ff0
         llvm_exe_sha256=ae47e6cc9f6d95f7a39e4800e511b7bdc3f55464ca79e45cd63cbd8a862a82a1
-        llvm_download_label=clang+llvm-${llvm_version}-x86_64-linux-gnu-ubuntu-18.04
+        llvm_download_name=clang+llvm-${llvm_version}-x86_64-linux-gnu-ubuntu-18.04
     elif [[ "${llvm_version}" == "12.0.1" ]]; then
         llvm_sha256=6b3cc55d3ef413be79785c4dc02828ab3bd6b887872b143e3091692fc6acefe7
         llvm_exe_sha256=329bba976c0cef38863129233a4b0939688eae971c7a606d41dd0e5a53d53455
-        llvm_download_label=clang+llvm-${llvm_version}-x86_64-linux-gnu-ubuntu-16.04
+        llvm_download_name=clang+llvm-${llvm_version}-x86_64-linux-gnu-ubuntu-16.04
     elif [[ "${llvm_version}" == "11.1.0" ]]; then
         llvm_sha256=c691a558967fb7709fb81e0ed80d1f775f4502810236aa968b4406526b43bee1
         llvm_exe_sha256=656bfde194276cee81dc8a7a08858313c5b5bdcfa18ac6cd6116297af2f65148
-        llvm_download_label=clang+llvm-${llvm_version}-x86_64-linux-gnu-ubuntu-16.04
+        llvm_download_name=clang+llvm-${llvm_version}-x86_64-linux-gnu-ubuntu-16.04
     fi
 
-    llvm_download_file=${downloads_dir}/${llvm_download_label}.tar.xz
-    llvm_label=llvm_linux64_${llvm_version}
-    llvm_dir=${tools_dir}/${llvm_label}
+    llvm_download_file=${llvm_download_name}.tar.xz
+    llvm_download_path=${downloads_dir}/${llvm_download_name}.tar.xz
+
+    llvm_dir=${tools_dir}/llvm_linux64_${llvm_version}
     llvm_exe=${llvm_dir}/bin/clang
+
     if [[ ! -f "${llvm_exe}" ]]; then
-        DownloadFile "https://github.com/llvm/llvm-project/releases/download/llvmorg-${llvm_version}/${llvm_download_label}.tar.xz" "${llvm_download_file}" || exit
-        FileSHA256Check "${llvm_download_file}" "${llvm_sha256}" || exit
-        mkdir --parents "${llvm_dir}" && tar xf "${llvm_download_file}" --skip-old-files --directory="${llvm_dir}" || exit
+        DownloadFile "https://github.com/llvm/llvm-project/releases/download/llvmorg-${llvm_version}/${llvm_download_file}" "${llvm_download_path}" || exit
+        FileSHA256Check "${llvm_download_path}" "${llvm_sha256}" || exit
+        mkdir --parents "${llvm_dir}" && tar xf "${llvm_download_path}" --skip-old-files --directory="${llvm_dir}" || exit
 
         if [[ "${llvm_version}" == "12.0.1" ]]; then
             # NOTE: There was a distribution bug in v12.0.1 where the folder was misnamed
             mv ${llvm_dir}/clang+llvm-${llvm_version}-x86_64-linux-gnu-ubuntu-/* ${llvm_dir} || exit
             rm --recursive ${llvm_dir}/clang+llvm-${llvm_version}-x86_64-linux-gnu-ubuntu- || exit
         else
-            mv ${llvm_dir}/${llvm_download_label}/* ${llvm_dir} || exit
-            rm --recursive ${llvm_dir}/${llvm_download_label} || exit
+            mv ${llvm_dir}/${llvm_download_name}/* ${llvm_dir} || exit
+            rm --recursive ${llvm_dir}/${llvm_download_name} || exit
         fi
     fi
     FileSHA256Check "${llvm_exe}" "${llvm_exe_sha256}" || exit
@@ -222,13 +228,39 @@ vim_plug=${vim_plug_dir}/plug.vim
 mkdir --parents ${vim_plug_dir}
 DownloadFile "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" "${vim_plug}" || exit
 
+# nodejs
+# ----------------------------------------------------------------------------
+nodejs_sha256=f0867d7a17a4d0df7dbb7df9ac3f9126c2b58f75450647146749ef296b31b49b
+nodejs_exe_sha256=8fdc420e870ef9aa87dc8c1b7764fccb8229b6896f112b699afeeefeb0021714
+nodejs_version=16.17.0
+
+nodejs_download_name=node-v${nodejs_version}-linux-x64
+nodejs_download_file=${nodejs_download_name}.tar.xz
+nodejs_download_path=${downloads_dir}/${nodejs_download_file}
+
+nodejs_dir=${tools_dir}/nodejs_linux64_${nodejs_version}
+nodejs_exe=${nodejs_dir}/bin/node
+
+if [[ ! -f "${nodejs_exe}" ]]; then
+    DownloadFile "https://nodejs.org/dist/v${nodejs_version}/${nodejs_download_file}" ${nodejs_download_path} || exit
+    FileSHA256Check ${nodejs_download_path} ${nodejs_sha256} || exit
+
+    mkdir --parents "${nodejs_dir}" && tar xf "${nodejs_download_path}" --skip-old-files --directory="${nodejs_dir}" || exit
+    mv ${nodejs_dir}/${nodejs_download_name}/* "${nodejs_dir}" || exit
+    rm --recursive ${nodejs_dir}/${nodejs_download_name}
+fi
+
+FileSHA256Check ${nodejs_exe} ${nodejs_exe_sha256} || exit
+ln --force --symbolic --relative "${nodejs_exe}" "${bin_dir}/node" || exit
+ln --force --symbolic --relative "${nodejs_dir}/bin/npm" "${bin_dir}/npm" || exit
+
 # Nvim
 # ------------------------------------------------------------------------------
 nvim_sha256=33b5d020c730b6d1b5185b1306ead83b6b8f8fab0239e0580c72b5224a9658e1
 nvim_version=0.7.2
 
 nvim_label=nvim_linux64_${nvim_version}
-nvim_exe=${tools_dir}/${nvim_label}.appimage
+nvim_exe=${tools_dir}/nvim_linux64_${nvim_version}.AppImage
 
 DownloadFile "https://github.com/neovim/neovim/releases/download/v${nvim_version}/nvim.appimage" "${nvim_exe}" || exit
 FileSHA256Check "${nvim_exe}" "${nvim_sha256}" || exit
@@ -243,16 +275,18 @@ neovide_sha256=684cbcaeb2e67f1d95822ef80e03e1475395d537f2032f47b8202fe48c428b08
 neovide_exe_sha256=e4fbc8b56af2e25127938ae2974921e25b4df5722086d7e8c3e517e8ee86e2df
 neovide_version=0.9.0
 
-neovide_label=neovide_linux64_${neovide_version}
-neovide_download_file=${downloads_dir}/${neovide_label}.tar.gz
+neovide_download_name=neovide
+neovide_download_file=${neovide_download_name}.tar.gz
+neovide_download_path=${downloads_dir}/${neovide_download_name}.tar.gz
+
 neovide_dir=${tools_dir}
-neovide_exe=${neovide_dir}/${neovide_label}
+neovide_exe=${neovide_dir}/neovide_linux64_${neovide_version}
 
 if [[ ! -f "${neovide_exe}" ]]; then
-    DownloadFile "https://github.com/neovide/neovide/releases/download/${neovide_version}/neovide.tar.gz" ${neovide_download_file} || exit
-    FileSHA256Check ${neovide_download_file} ${neovide_sha256} || exit
+    DownloadFile "https://github.com/neovide/neovide/releases/download/${neovide_version}/${neovide_download_file}" ${neovide_download_path} || exit
+    FileSHA256Check ${neovide_download_path} ${neovide_sha256} || exit
 
-    mkdir --parents ${neovide_dir}/neovide-tmp && tar xf ${neovide_download_file} --skip-old-files --directory=${neovide_dir}/neovide-tmp || exit
+    mkdir --parents ${neovide_dir}/neovide-tmp && tar xf ${neovide_download_path} --skip-old-files --directory=${neovide_dir}/neovide-tmp || exit
     mv ${neovide_dir}/neovide-tmp/target/release/neovide "${neovide_exe}" || exit
     rm -rf ${neovide_dir}/neovide-tmp
 fi
@@ -266,16 +300,17 @@ python_sha256=460f87a389be28c953c24c6f942f172f9ce7f331367b4daf89cb450baedd51d7
 python_exe_sha256=1400cb8f2cf2f606d1c87c1edb69ea1b3479b4c2bfb5c438a4828903a1d6f9f8
 python_version=3.10.5
 
-python_label=python_linux64_${python_version}
-python_download_label=cpython-${python_version}+20220630-x86_64-unknown-linux-gnu-install_only
-python_download_file=${downloads_dir}/${python_download_label}.tar.gz
-python_dir=${tools_dir}/${python_label}
+python_download_name=cpython-${python_version}+20220630-x86_64-unknown-linux-gnu-install_only
+python_download_file=${python_download_name}.tar.gz
+python_download_path=${downloads_dir}/${python_download_file}
+
+python_dir=${tools_dir}/python_linux64_${python_version}
 python_exe=${python_dir}/bin/python3
 
 if [[ ! -f "${python_exe}" ]]; then
-    DownloadFile "https://github.com/indygreg/python-build-standalone/releases/download/20220630/${python_download_label}.tar.gz" "${python_download_file}" || exit
-    FileSHA256Check "${python_download_file}" "${python_sha256}" || exit
-    mkdir --parents "${python_dir}" && tar xf "${python_download_file}" --skip-old-files --directory="${python_dir}" || exit
+    DownloadFile "https://github.com/indygreg/python-build-standalone/releases/download/20220630/${python_download_file}" "${python_download_path}" || exit
+    FileSHA256Check "${python_download_path}" "${python_sha256}" || exit
+    mkdir --parents "${python_dir}" && tar xf "${python_download_path}" --skip-old-files --directory="${python_dir}" || exit
     mv --force ${python_dir}/python/* "${python_dir}" || exit
     rm --recursive ${python_dir}/python || exit
 fi
@@ -294,18 +329,19 @@ ripgrep_sha256=ee4e0751ab108b6da4f47c52da187d5177dc371f0f512a7caaec5434e711c091
 ripgrep_exe_sha256=4ef156371199b3ddac1bf584e0e52b1828279af82e4ea864b4d9c816adb5db40
 ripgrep_version=13.0.0
 
-ripgrep_label=ripgrep_linux64_${ripgrep_version}
-ripgrep_download_label=ripgrep-${ripgrep_version}-x86_64-unknown-linux-musl
-ripgrep_download_file=${downloads_dir}/${ripgrep_download_label}.tar.gz
-ripgrep_dir=${tools_dir}/${ripgrep_label}
+ripgrep_download_name=ripgrep-${ripgrep_version}-x86_64-unknown-linux-musl
+ripgrep_download_file=${ripgrep_download_name}.tar.gz
+ripgrep_download_path=${downloads_dir}/${ripgrep_download_file}
+
+ripgrep_dir=${tools_dir}/ripgrep_linux64_${ripgrep_version}
 ripgrep_exe=${ripgrep_dir}/rg
 
 if [[ ! -f "${ripgrep_exe}" ]]; then
-    DownloadFile "https://github.com/BurntSushi/ripgrep/releases/download/${ripgrep_version}/${ripgrep_download_label}.tar.gz" "${ripgrep_download_file}" || exit
-    FileSHA256Check "${ripgrep_download_file}" "${ripgrep_sha256}" || exit
-    mkdir --parents "${ripgrep_dir}" && tar xf "${ripgrep_download_file}" --skip-old-files --directory="${ripgrep_dir}" || exit
-    mv ${ripgrep_dir}/${ripgrep_download_label}/* "${ripgrep_dir}" || exit
-    rm --recursive ${ripgrep_dir}/${ripgrep_download_label} || exit
+    DownloadFile "https://github.com/BurntSushi/ripgrep/releases/download/${ripgrep_version}/${ripgrep_download_file}" "${ripgrep_download_path}" || exit
+    FileSHA256Check "${ripgrep_download_path}" "${ripgrep_sha256}" || exit
+    mkdir --parents "${ripgrep_dir}" && tar xf "${ripgrep_download_path}" --skip-old-files --directory="${ripgrep_dir}" || exit
+    mv ${ripgrep_dir}/${ripgrep_download_name}/* "${ripgrep_dir}" || exit
+    rm --recursive ${ripgrep_dir}/${ripgrep_download_name} || exit
 fi
 
 FileSHA256Check "${ripgrep_exe}" "${ripgrep_exe_sha256}" || exit
@@ -316,11 +352,11 @@ ln --force --symbolic --relative "${ripgrep_exe}" "${bin_dir}"
 wezterm_sha256=4de3cd65b7d7ae0c72a691597bd3def57c65f07fe4a7c98b447b8a9dc4d0adf0
 wezterm_version=20220624-141144-bd1b7c5d
 
-wezterm_label=wezterm_linux64_${wezterm_version}
-wezterm_download_label=WezTerm-${wezterm_version}-Ubuntu18.04
-wezterm_exe=${tools_dir}/${wezterm_label}.AppImage
+wezterm_download_name=WezTerm-${wezterm_version}-Ubuntu18.04
+wezterm_download_file=${wezterm_download_name}.AppImage
+wezterm_exe=${tools_dir}/wezterm_linux64_${wezterm_version}.AppImage
 
-DownloadFile "https://github.com/wez/wezterm/releases/download/${wezterm_version}/${wezterm_download_label}.AppImage" "${wezterm_exe}" || exit
+DownloadFile "https://github.com/wez/wezterm/releases/download/${wezterm_version}/${wezterm_download_file}" ${wezterm_exe} || exit
 FileSHA256Check "${wezterm_exe}" "${wezterm_sha256}" || exit
 
 chmod +x "${wezterm_exe}"

From 312e62031e3c80a01413d62b7ad0659e901ff8b5 Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Fri, 2 Sep 2022 09:21:44 +1000
Subject: [PATCH 19/41] vim-fugitive

---
 Installer/os_nvim_init.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Installer/os_nvim_init.vim b/Installer/os_nvim_init.vim
index b7a5d19..1e34f66 100644
--- a/Installer/os_nvim_init.vim
+++ b/Installer/os_nvim_init.vim
@@ -5,6 +5,7 @@ call plug#begin(stdpath('config') . '/plugged')
     " vim-dispatch allows running async jobs in vim (i.e. builds in the background)
     Plug 'https://github.com/scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
     Plug 'https://github.com/tpope/vim-dispatch'
+    Plug 'https://github.com/tpope/vim-fugitive'
 
     " TODO: 2022-06-19 Treesitter is too slow on large C++ files
     " Plug 'https://github.com/nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}

From ec3f982c323d5fb2f89aecbb27f663d9e73e4b21 Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Thu, 8 Sep 2022 11:30:18 +1000
Subject: [PATCH 20/41] ninja && neovide

---
 win_install.bat | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/win_install.bat b/win_install.bat
index 65aeee7..93d544d 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -474,9 +474,9 @@ call win_helpers.bat :FileHashCheck sha256 "!mingw_exe!" "!mingw_exe_sha256!" ||
 
 REM ninja
 REM ----------------------------------------------------------------------------
-set ninja_sha256=bbde850d247d2737c5764c927d1071cbb1f1957dcabda4a130fa8547c12c695f
-set ninja_exe_sha256=6a71c03f88897419f19548a8eadd941ed94144bb671be289822080f991c1ab79
-set ninja_version=1.10.2
+set ninja_sha256=524B344A1A9A55005EAF868D991E090AB8CE07FA109F1820D40E74642E289ABC
+set ninja_exe_sha256=23E7D60C17B3FCD42D9C00D49ECA3C3771B04D7CCB13E49836B06B34E20211C7
+set ninja_version=1.11.1
 
 set ninja_download_name=ninja-win
 set ninja_download_file=!ninja_download_name!.zip
@@ -847,9 +847,9 @@ call win_helpers.bat :MakeRelativeBatchShortcut "nvim-qt" "..\!nvim_dir_name!\bi
 
 REM Neovide
 REM ----------------------------------------------------------------------------
-set neovide_sha256=D1DE20E0FCBF68CB4D85CD6F15691DFB77848DAFB97519F8E67E3036A2A7927D
-set neovide_exe_sha256=C0F6ED7ED8BAC4EE910267FA785DA698A581004EA45838BE401E3FBA18DD3234
-set neovide_version=0.9.0
+set neovide_sha256=944E75545F8FAE08AE42FDB0D2073F699C7ED209EC02B2BEDF062377C0929456
+set neovide_exe_sha256=2808A6719241407AA956044DF553D6008C6D8DB3BB00D24B50893F03978E07CF
+set neovide_version=0.10.1
 
 set neovide_download_name=neovide-windows
 set neovide_download_file=!neovide_download_name!.zip

From bce5f7aba3619a9dbfacda3d5b5367ceef13d8ce Mon Sep 17 00:00:00 2001
From: doyle <doyle.thai@aosgrp.com>
Date: Thu, 8 Sep 2022 17:10:22 +1000
Subject: [PATCH 21/41] gcc vars script

---
 linux_install.sh | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/linux_install.sh b/linux_install.sh
index fb3c261..effb9e1 100755
--- a/linux_install.sh
+++ b/linux_install.sh
@@ -128,13 +128,32 @@ cp "${installer_dir}/unix_gcc_dockerfile" "${gcc_dir}/Dockerfile"
 
 cd "${gcc_dir}" || exit
     for gcc_version in ${gcc_version_list[@]}; do
-        gcc_bin_dir=${gcc_dir}/gcc-mostlyportable-${gcc_version}/bin
+        gcc_root_dir=${gcc_dir}/gcc-mostlyportable-${gcc_version}
+        gcc_bin_dir=${gcc_root_dir}/bin
         if [[ ! -f "${gcc_bin_dir}/g++" ]]; then
             ./build.sh ${gcc_version} || exit
         fi
+
+        # Symbolic link the versioned gcc executables
         ln --symbolic --force --relative ${gcc_bin_dir}/g++ ${bin_dir}/g++-${gcc_version} || exit
         ln --symbolic --force --relative ${gcc_bin_dir}/gcc ${bin_dir}/gcc-${gcc_version} || exit
+
+        # Create script that setups the environment path for building with a versioned GCC
+        gcc_script_name=g++-${gcc_version}-vars.sh
+        gcc_script_path=${gcc_dir}/${gcc_script_name}
+
+        echo "gcc_mostlyportable_dir=\"${gcc_root_dir}\" \\" > ${gcc_script_path}
+        echo "PATH=\${gcc_mostlyportable_dir}/bin:\${PATH} \\" >> ${gcc_script_path}
+        echo "LD_LIBRARY_PATH=\${gcc_mostlyportable_dir}/lib:\${LD_LIBRARY_PATH} \\" >> ${gcc_script_path}
+        echo "LD_LIBRARY_PATH=\${gcc_mostlyportable_dir}/lib64:\${LD_LIBRARY_PATH} \\" >> ${gcc_script_path}
+        echo "\$@" >> ${gcc_script_path}
+
+        chmod +x ${gcc_script_path}
+
+        # Symbolic link the script to load the GCC environment
+        ln --symbolic --force --relative ${gcc_script_path} ${bin_dir}/gcc-${gcc_version}-vars.sh || exit
     done
+
     ln --symbolic --force --relative "${gcc_bin_dir}/g++" "${bin_dir}/g++" || exit
     ln --symbolic --force --relative "${gcc_bin_dir}/gcc" "${bin_dir}/gcc" || exit
 cd "${root_dir}" || exit

From f63e15fd9845369c1fa05047a7850aa56f2234c4 Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Sat, 10 Sep 2022 17:17:30 +1000
Subject: [PATCH 22/41] stuff

---
 Installer/win_portable-msvc.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Installer/win_portable-msvc.py b/Installer/win_portable-msvc.py
index 428f05a..3d7f8c0 100644
--- a/Installer/win_portable-msvc.py
+++ b/Installer/win_portable-msvc.py
@@ -180,7 +180,7 @@ sdk_packages = [
   f"Windows SDK for Windows Store Apps Tools-x86_en-us.msi",
   # Windows SDK headers
   f"Windows SDK for Windows Store Apps Headers-x86_en-us.msi",
-  f"Windows SDK Desktop Headers {TARGET}-x86_en-us.msi",
+  f"Windows SDK Desktop Headers x86-x86_en-us.msi",
   # Windows SDK libs
   f"Windows SDK for Windows Store Apps Libs-x86_en-us.msi",
   f"Windows SDK Desktop Libs {TARGET}-x86_en-us.msi",
@@ -282,8 +282,7 @@ set INCLUDE=%MSVC_ROOT%\\include;%SDK_INCLUDE%\\ucrt;%SDK_INCLUDE%\\shared;%SDK_
 set LIB=%MSVC_ROOT%\\lib\\%MSVC_ARCH%;%SDK_LIBS%\\ucrt\\%SDK_ARCH%;%SDK_LIBS%\\um\\%SDK_ARCH%
 """
 
-with open(OUTPUT / "setup.bat", "w") as f:
-  print(SETUP, file=f)
+(OUTPUT / "setup.bat").write_text(SETUP)
 
 print(f"Total downloaded: {total_download>>20} MB")
 print("Done!")

From 42f64933ddf5e9f41bd20792c5557335ee9b197a Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Sat, 10 Sep 2022 18:33:42 +1000
Subject: [PATCH 23/41] stuff

---
 win_install.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/win_install.bat b/win_install.bat
index 93d544d..82938fb 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -632,7 +632,7 @@ call win_helpers.bat :MakeRelativeBatchShortcut "zig-!zig_version!" "..\!zig_dir
 REM MSVC
 REM ----------------------------------------------------------------------------
 REM This depends on python, so it must be installed after it.
-set msvc_version=14.32
+set msvc_version=14.33
 set msvc_sdk_version=22621
 set msvc_dir_name=msvc_win64_!msvc_version!_win10_sdk_!msvc_sdk_version!
 set msvc_dir=!tools_dir!\!msvc_dir_name!

From 4f8cffc9663dffc687c1207ec55690df23b81846 Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Sun, 25 Sep 2022 23:41:31 +1000
Subject: [PATCH 24/41] nvim stuff

---
 Installer/os_nvim_init.vim | 79 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)

diff --git a/Installer/os_nvim_init.vim b/Installer/os_nvim_init.vim
index 1e34f66..77cfd92 100644
--- a/Installer/os_nvim_init.vim
+++ b/Installer/os_nvim_init.vim
@@ -99,6 +99,85 @@ lua <<EOF
     signs = false,
   })
 
+  -- Check if there were args (i.e. opened file), non-empty buffer, or started in insert mode
+  if vim.fn.argc() == 0 or vim.fn.line2byte("$") ~= -1 and not opt.insertmode then
+    local ascii = {
+        "",
+        "  Useful Bindings (Normal Mode)",
+        "  --------------------------------------------------",
+        "  <ctrl+n>  to open the file tree explorer",
+        "  <ctrl+i>  clang format selected lines",
+        "  <ctrl+j>  jump to next compilation error",
+        "  <ctrl+k>  jump to prev compilation error",
+        "  <cd>      change working directory to current file",
+        "  <\\s>      split buffer vertically",
+        "  ",
+        "  Telescope Bindings (Normal Mode)",
+        "  --------------------------------------------------",
+        "  <\\te>     open telescope menu",
+        "  <\\ta>     search for symbol via tags",
+        "  <\\f>      search for file",
+        "  <\\g>      search for text",
+        "  <\\b>      search for buffer",
+        "  <\\h>      search VIM help menu",
+        "  ",
+        "  LSP Bindings (Normal Mode)",
+        "  --------------------------------------------------",
+        "  <gD>      on (applicable) symbol, jump to declaration",
+        "  <gd>      on (applicable) symbol, jump to definition",
+        "  <gt>      on (applicable) symbol, jump to type definition",
+        "  <gr>      on (applicable) symbol, show caller references",
+        "  <gf>      on (applicable) symbol, search available symbols",
+        "  <ga>      on (applicable) symbol, show code-actions prompt",
+        "  <gR>      on (applicable) symbol, code-aware symbol rename",
+        "  <gs>      on (applicable) symbol, show signature help",
+        "  <shift+k> on (applicable) symbol, show documentation",
+        "  <space+e> on red underlined symbol error, show error message",
+        "  <alt+n>   jump to next LSP error",
+        "  <alt+n>   jump to prev LSP error",
+    }
+
+    local height = vim.api.nvim_get_option("lines")
+    local width = vim.api.nvim_get_option("columns")
+    local ascii_rows = #ascii
+    local ascii_cols = #ascii[1]
+    local win = vim.api.nvim_get_current_win()
+    local buf = vim.api.nvim_create_buf(true, true)
+
+    local function reset_start_screen()
+        vim.cmd("enew")
+        local buf = vim.api.nvim_get_current_buf()
+        local win = vim.api.nvim_get_current_win()
+        vim.api.nvim_buf_set_option(buf, "modifiable", true)
+        vim.api.nvim_buf_set_option(buf, "buflisted", true)
+        vim.api.nvim_buf_set_option(buf, "buflisted", true)
+        vim.api.nvim_win_set_option(win, "colorcolumn", "80,100")
+        vim.api.nvim_win_set_option(win, "relativenumber", true)
+        vim.api.nvim_win_set_option(win, "number", true)
+        vim.api.nvim_win_set_option(win, "list", true)
+    end
+
+    -- Only display if there is enough space
+    if height >= ascii_rows and width >= ascii_cols then
+      vim.api.nvim_buf_set_lines(buf, 0, -1, false, ascii)
+      vim.api.nvim_buf_set_option(buf, "modified", false)
+      vim.api.nvim_buf_set_option(buf, "buflisted", false)
+      vim.api.nvim_buf_set_option(buf, "bufhidden", "wipe")
+      vim.api.nvim_buf_set_option(buf, "buftype", "nofile")
+      vim.api.nvim_buf_set_option(buf, "swapfile", false)
+      vim.api.nvim_win_set_option(win, "colorcolumn", "")
+      vim.api.nvim_win_set_option(win, "relativenumber", false)
+      vim.api.nvim_win_set_option(win, "number", false)
+      vim.api.nvim_win_set_option(win, "list", false)
+      vim.api.nvim_set_current_buf(buf)
+
+      vim.api.nvim_create_autocmd("InsertEnter,WinEnter", {
+          pattern = "<buffer>",
+          callback = reset_start_screen,
+      })
+    end
+  end
+
   -- LSP Setup
   -- ===========================================================================
   -- Load the additional capabilities supported by nvim-cmp

From e90b7b982bace5367ee634af9c42458a1c4a958a Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Mon, 26 Sep 2022 10:11:50 +1000
Subject: [PATCH 25/41] stuff

---
 win_install.bat | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/win_install.bat b/win_install.bat
index 82938fb..0e1b505 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -496,6 +496,11 @@ if not exist "!ninja_exe!" (
 call win_helpers.bat :FileHashCheck sha256 "!ninja_exe!" "!ninja_exe_sha256!" || exit /B %ERRORLEVEL%
 call win_helpers.bat :MakeRelativeBatchShortcut "ninja" "..\!ninja_dir_name!\ninja.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
 
+REM Terminal
+REM NOTE: We directly link to the ninja directory because CMake struggles to
+REM find ninja if not.
+echo set PATH=%%~dp0!ninja_dir_name!;%%PATH%%>> "!tmp_terminal_script!"
+
 REM nodejs
 REM ----------------------------------------------------------------------------
 set nodejs_sha256=f7b0e8b0bfcfad7d62eba16fa4db9f085983c12c661bd4c66d8e3bd783befa65

From 4dc39ab39337c0193af4ee06afe515c6a0000d24 Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Thu, 29 Sep 2022 00:45:08 +1000
Subject: [PATCH 26/41] add sioyek

---
 win_install.bat | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/win_install.bat b/win_install.bat
index 0e1b505..eb1f648 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -1030,6 +1030,30 @@ call win_helpers.bat :FileHashCheck sha256 "!rg_exe!" "!rg_exe_sha256!" || exit
 REM Terminal
 echo set PATH=%%~dp0!rg_dir_name!;%%PATH%%>> "!tmp_terminal_script!"
 
+REM sioyek (PDF Viewer)
+REM ----------------------------------------------------------------------------
+set sioyek_sha256=B9C1C02DDA4932E488DB6AA08417854FBA436B492C7261C6CF04AE2AF0329F66
+set sioyek_exe_sha256=A30306931FC5E97DAF72CF9A82C2DA1D994392CDBD5DF5C7F0D56C26FFC3A33E
+set sioyek_version=1.5.0
+
+set sioyek_download_name=sioyek-release-windows-portable
+set sioyek_download_file=!sioyek_download_name!.zip
+set sioyek_download_path=!downloads_dir!\!sioyek_download_file!
+set sioyek_download_url="https://github.com/ahrm/sioyek/releases/download/v1.5.0/sioyek-release-windows-portable.zip"
+
+set sioyek_dir_name=sioyek_win64_!sioyek_version!
+set sioyek_dir=!tools_dir!\!sioyek_dir_name!
+set sioyek_exe=!sioyek_dir!\sioyek.exe
+
+if not exist "!sioyek_exe!" (
+    call win_helpers.bat :DownloadFile "!sioyek_download_url!" "!sioyek_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!sioyek_download_path!" "!sioyek_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!sioyek_download_path!" "!sioyek_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir "!sioyek_dir!\sioyek-release-windows" "!sioyek_dir!" || exit /B %ERRORLEVEL%
+)
+
+call win_helpers.bat :FileHashCheck sha256 "!sioyek_exe!" "!sioyek_exe_sha256!" || exit /B %ERRORLEVEL%
+
 REM fd
 REM ----------------------------------------------------------------------------
 set fd_sha256=F21BC26C1AB6BDBE4FE43F87A20C792D4ABE629AE97C6F42B25AC8A042F5521F

From e57b55288280bac53a25d40144c20ce1e467364a Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Mon, 24 Oct 2022 10:23:28 +1100
Subject: [PATCH 27/41] Sane nvim init page

---
 Installer/os_nvim_init.vim | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Installer/os_nvim_init.vim b/Installer/os_nvim_init.vim
index 77cfd92..a1fd7d0 100644
--- a/Installer/os_nvim_init.vim
+++ b/Installer/os_nvim_init.vim
@@ -151,10 +151,6 @@ lua <<EOF
         vim.api.nvim_buf_set_option(buf, "modifiable", true)
         vim.api.nvim_buf_set_option(buf, "buflisted", true)
         vim.api.nvim_buf_set_option(buf, "buflisted", true)
-        vim.api.nvim_win_set_option(win, "colorcolumn", "80,100")
-        vim.api.nvim_win_set_option(win, "relativenumber", true)
-        vim.api.nvim_win_set_option(win, "number", true)
-        vim.api.nvim_win_set_option(win, "list", true)
     end
 
     -- Only display if there is enough space
@@ -165,10 +161,6 @@ lua <<EOF
       vim.api.nvim_buf_set_option(buf, "bufhidden", "wipe")
       vim.api.nvim_buf_set_option(buf, "buftype", "nofile")
       vim.api.nvim_buf_set_option(buf, "swapfile", false)
-      vim.api.nvim_win_set_option(win, "colorcolumn", "")
-      vim.api.nvim_win_set_option(win, "relativenumber", false)
-      vim.api.nvim_win_set_option(win, "number", false)
-      vim.api.nvim_win_set_option(win, "list", false)
       vim.api.nvim_set_current_buf(buf)
 
       vim.api.nvim_create_autocmd("InsertEnter,WinEnter", {

From 2daa78d15faf7345acc33bf14144095250e3aa69 Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Tue, 8 Nov 2022 15:31:48 +1100
Subject: [PATCH 28/41] win: Add wincap, update git

---
 Installer/win_wcap_2022-08-11_d3b6d0d.exe | Bin 0 -> 56832 bytes
 win_install.bat                           |  10 +++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 Installer/win_wcap_2022-08-11_d3b6d0d.exe

diff --git a/Installer/win_wcap_2022-08-11_d3b6d0d.exe b/Installer/win_wcap_2022-08-11_d3b6d0d.exe
new file mode 100644
index 0000000000000000000000000000000000000000..fb26e45c2e2e54d3eed8220a5fd102d8d3c99bdd
GIT binary patch
literal 56832
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

literal 0
HcmV?d00001

diff --git a/win_install.bat b/win_install.bat
index eb1f648..ddc2995 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -264,14 +264,14 @@ call win_helpers.bat :MakeRelativeBatchShortcut "doxygen" "..\!doxygen_dir_name!
 
 REM Git
 REM ----------------------------------------------------------------------------
-set git_sha256=bc030848e282d49e562ae2392a72501cf539322ad06ffe4cea8cf766f148dfe8
-set git_exe_sha256=ae463cad04c2b15fc91de68ab096933ec08c44752e205aebd7d64c3a482df62d
-set git_version=2.33.0
+set git_sha256=cdcdb268aaed1dd2ac33d1dfdaf105369e3d7bd8d84d641d26d30b34e706b843
+set git_exe_sha256=6C4DBB77D05CA5C482CE3782255F56BB904445809F1DF3B655E2505EAC7FA0B2
+set git_version=2.38.1
 
-set git_download_name=PortableGit-!git_version!.2-64-bit.7z
+set git_download_name=PortableGit-!git_version!-64-bit.7z
 set git_download_file=!git_download_name!.exe
 set git_download_path=!downloads_dir!\!git_download_file!
-set git_download_url="https://github.com/git-for-windows/git/releases/download/v!git_version!.windows.2/!git_download_file!"
+set git_download_url="https://github.com/git-for-windows/git/releases/download/v!git_version!.windows.1/!git_download_file!"
 
 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.

From ad2e32fcf5710f90790f559b5b41a6b94b90a2ca Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Mon, 14 Nov 2022 23:45:06 +1100
Subject: [PATCH 29/41] win: mpc-qt, jpegview64, fix git-hash checks

---
 win_install.bat | 68 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 65 insertions(+), 3 deletions(-)

diff --git a/win_install.bat b/win_install.bat
index ddc2995..ec7f7a6 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -681,7 +681,7 @@ if not exist "!symget_exe!" (
 
 REM Odin
 REM ----------------------------------------------------------------------------
-set odin_git_hash=7fe36de
+set odin_git_hash=7fe36de0
 set odin_dir_name=odin_win64
 set odin_dir=!tools_dir!\!odin_dir_name!
 set odin_exe=!odin_dir!\odin.exe
@@ -696,6 +696,7 @@ for /F "tokens=1 USEBACKQ" %%F IN (`"!git_exe!" -C !odin_dir! rev-parse --short
 set odin_curr_git_hash=!odin_curr_git_hash:~0,-1!
 
 if "!odin_curr_git_hash!" neq "!odin_git_hash!" (
+    echo - [Git] Required hash changed, rebuilding [curr="!odin_curr_git_hash!", req="!odin_git_hash!"]
     call "!git_exe!" -C "!odin_dir!" pull origin master || exit /B %ERRORLEVEL%
     call "!git_exe!" -C "!odin_dir!" checkout "!odin_git_hash!" || exit /B %ERRORLEVEL%
     if exist "!odin_exe!" del /F "!odin_exe!"
@@ -739,13 +740,24 @@ call win_helpers.bat :FileHashCheck sha256 "!clink_exe!" "!clink_exe_sha256!" ||
 call win_helpers.bat :MakeRelativeBatchShortcut "clink" "..\!clink_dir_name!\clink.bat" "!bin_dir!" || exit /B %ERRORLEVEL%
 
 REM Clink Completion Addon
+set clink_completions_git_hash=fa18736
 set clink_completions_dir_name=clink-completions
 set clink_completions_dir=!tools_dir!\!clink_completions_dir_name!
 if not exist "!clink_completions_dir!" (
     call !git_exe! clone https://github.com/vladimir-kotikov/clink-completions !clink_completions_dir! || exit /B %ERRORLEVEL%
 )
-call !git_exe! -C !clink_completions_dir! pull origin master || exit /B %ERRORLEVEL%
-call !git_exe! -C !clink_completions_dir! checkout 9ab9342 || exit /B %ERRORLEVEL%
+
+REM Extract current git hash of the repository. Remove the last character as
+REM rev-parse has a trailing whitespace.
+for /F "tokens=1 USEBACKQ" %%F IN (`"!git_exe!" -C !clink_completions_dir! rev-parse --short HEAD`) do ( SET clink_completions_curr_git_hash=%%F )
+set clink_completions_curr_git_hash=!clink_completions_curr_git_hash:~0,-1!
+
+if "!clink_completions_curr_git_hash!" neq "!clink_completions_git_hash!" (
+    echo - [Git] Required hash changed, rebuilding [curr="!clink_completions_curr_git_hash!", req="!clink_completions_git_hash!"]
+    call "!git_exe!" -C "!clink_completions_dir!" pull origin master || exit /B %ERRORLEVEL%
+    call "!git_exe!" -C "!clink_completions_dir!" checkout "!clink_completions_git_hash!" || exit /B %ERRORLEVEL%
+)
+
 
 REM Terminal Script
 echo set CLINK_PATH=%%~dp0!clink_completions_dir_name!>> "!tmp_terminal_script!
@@ -824,6 +836,56 @@ REM Use FD for FZF to make it ultra fast
 echo set FZF_DEFAULT_OPTS=--multi --layout=reverse>> "!tmp_terminal_script!"
 echo set FZF_DEFAULT_COMMAND=fd --unrestricted>> "!tmp_terminal_script!"
 
+REM jpegview
+REM ----------------------------------------------------------------------------
+set jpegview_sha256=82BA6F84A7D7C88C655253ACB41FFED9E8667CF1F3AC9573836952C08C4DC82C
+set jpegview_exe_sha256=1FFE58601AB160C57D01823FAC8BFEB36C1BFD782E6F60ADFA57EED6240B09B3
+set jpegview_version=1.0.40
+
+set jpegview_download_name=JPEGView_!jpegview_version!
+set jpegview_download_file=!jpegview_download_name!.7z
+set jpegview_download_path=!downloads_dir!\!jpegview_download_file!
+set jpegview_download_url="https://github.com/sylikc/jpegview/releases/download/v!jpegview_version!/!jpegview_download_file!"
+
+set jpegview_dir_name=jpegview_win64_!jpegview_version!
+set jpegview_dir=!tools_dir!\!jpegview_dir_name!
+set jpegview_exe=!jpegview_dir!\JPEGView.exe
+
+if not exist "!jpegview_exe!" (
+    call win_helpers.bat :DownloadFile "!jpegview_download_url!" "!jpegview_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!jpegview_download_path!" "!jpegview_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!jpegview_download_path!" "!jpegview_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MoveDir "!jpegview_dir!\JPEGView64" "!jpegview_dir!" || exit /B %ERRORLEVEL%
+    rmdir /s /q "!jpegview_dir!\JPEGView32" || exit /B %ERRORLEVEL%
+    del "!jpegview_dir!\HowToInstall.txt" "!jpegview_dir!\HowToInstall_ru.txt" || exit /B %ERRORLEVEL%
+)
+
+call win_helpers.bat :FileHashCheck sha256 "!jpegview_exe!" "!jpegview_exe_sha256!" || exit /B %ERRORLEVEL%
+
+REM mpc_qt
+REM ----------------------------------------------------------------------------
+set mpc_qt_sha256=2230c4f4de1a429ccc67e5c590efc0a86fbaffeb33a4dc5f391aa45e660b80c2
+set mpc_qt_exe_sha256=d7ee46b0d4a61a26f8acd5d5fd4da2d252d6bc80c5cab6a55db06e853f2acefb
+set mpc_qt_version=22.02
+set mpc_qt_version_no_dot=2202
+
+set mpc_qt_download_name=mpc-qt-win-x64-!mpc_qt_version_no_dot!
+set mpc_qt_download_file=!mpc_qt_download_name!.zip
+set mpc_qt_download_path=!downloads_dir!\!mpc_qt_download_file!
+set mpc_qt_download_url="https://github.com/mpc-qt/mpc-qt/releases/download/v!mpc_qt_version!/!mpc_qt_download_file!"
+
+set mpc_qt_dir_name=mpc-qt_win64_!mpc_qt_version!
+set mpc_qt_dir=!tools_dir!\!mpc_qt_dir_name!
+set mpc_qt_exe=!mpc_qt_dir!\mpc-qt.exe
+
+if not exist "!mpc_qt_exe!" (
+    call win_helpers.bat :DownloadFile "!mpc_qt_download_url!" "!mpc_qt_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!mpc_qt_download_path!" "!mpc_qt_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!mpc_qt_download_path!" "!mpc_qt_dir!" || exit /B %ERRORLEVEL%
+)
+
+call win_helpers.bat :FileHashCheck sha256 "!mpc_qt_exe!" "!mpc_qt_exe_sha256!" || exit /B %ERRORLEVEL%
+
 REM NVIM
 REM ----------------------------------------------------------------------------
 set nvim_sha256=a72a90e2897ea296b777c325a37c981a0b51e2fe0c8b8735e3366b65e958cddc

From fe2d3c71d3faeb678ff17db68d39cd58ffd1272d Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Wed, 16 Nov 2022 00:17:17 +1100
Subject: [PATCH 30/41] win: Use hardlinks/junctions instead of bat files

---
 win_helpers.bat |  52 ++++++++-
 win_install.bat | 277 +++++++++++++++++++++++++++---------------------
 2 files changed, 205 insertions(+), 124 deletions(-)

diff --git a/win_helpers.bat b/win_helpers.bat
index 50f7144..74728b0 100644
--- a/win_helpers.bat
+++ b/win_helpers.bat
@@ -1,6 +1,6 @@
 @echo off
 setlocal EnableDelayedExpansion
-REM Win Helpers - Version 10
+REM Win Helpers - Version 11
 call %*
 goto exit
 
@@ -150,5 +150,55 @@ echo @echo off> "!dest_dir!\!name!.bat"
 echo %%~dp0!executable! %%*>> "!dest_dir!\!name!.bat"
 exit /B 0
 
+:MakeFileHardLink
+REM call win_helpers.bat :MakeFileHardLink dest src
+REM ------------------------------------------------------------------------------------------------
+set dest=%~1
+set src=%~2
+if not exist "!src!" (
+    echo - [MakeFileHardLink] Source file does not exist [src=!src!]
+    exit /B 1
+)
+
+if exist "%dest%" (
+    del "!dest!"
+    if exist "!dest!" (
+        echo - [MakeFileHardLink] Failed to delete destination file [dest=!dest!]
+        exit /B 1
+    )
+)
+
+mklink /H "!dest!" "!src!"
+if not exist "!dest!" (
+    echo - [MakeFileHardLink] Failed to make hard link at dest [src=!src!, dest=!dest!]
+    exit /B 1
+)
+exit /B 0
+
+:MakeDirHardLink
+REM call win_helpers.bat :MakeDirHardLink dest src
+REM ------------------------------------------------------------------------------------------------
+set dest=%~1
+set src=%~2
+if not exist "!src!" (
+    echo - [MakeDirHardLink] Source file does not exist [src=!src!]
+    exit /B 1
+)
+
+if exist "%dest%" (
+    rmdir /S /Q "!dest!"
+    if exist "!dest!" (
+        echo - [MakeDirHardLink] Failed to delete destination dir [dest=!dest!]
+        exit /B 1
+    )
+)
+
+mklink /J "!dest!" "!src!"
+if not exist "!dest!" (
+    echo - [MakeDirHardLink] Failed to make hard link at dest [src=!src!, dest=!dest!]
+    exit /B 1
+)
+exit /B 0
+
 :exit
 exit /B
diff --git a/win_install.bat b/win_install.bat
index ec7f7a6..c81ab6f 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -68,13 +68,14 @@ REM version however can.
 set zip7_sha256=0b461f0a0eccfc4f39733a80d70fd1210fdd69f600fb6b657e03940a734e5fc1
 set zip7_exe_sha256=ed24ed04b5d4a20b3f50fc088a455195c756d7b5315d1965e8c569472b43d939
 set zip7_version=2107
+set zip7_name=7zip_win64
 
 set zip7_download_name=7z!zip7_version!-x64
 set zip7_download_file=!zip7_download_name!.exe
 set zip7_download_path=!downloads_dir!\!zip7_download_file!
 set zip7_download_url="https://www.7-zip.org/a/!zip7_download_file!"
 
-set zip7_dir_name=7zip_win64_!zip7_version!
+set zip7_dir_name=!zip7_name!_!zip7_version!
 set zip7_dir=!tools_dir!\!zip7_dir_name!
 set zip7_exe=!zip7_dir!\7z.exe
 
@@ -85,38 +86,41 @@ if not exist "!zip7_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!zip7_exe!" "!zip7_exe_sha256!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeDirHardLink "!tools_dir!\!zip7_name!" "!zip7_dir!" || exit /B %ERRORLEVEL%
 
 REM Terminal
 echo set PATH=%%~dp0!zip7_dir_name!;%%PATH%%>> "!tmp_terminal_script!"
 
 REM GPG Signature Verification
 REM ----------------------------------------------------------------------------
-set gpg_w32_sha256=1a18adbb24868e14a40ccbd60003108840e238c0893e7bb6908805ae067eb0e8
-set gpg_w32_exe_sha256=ac181fb744df2950880458f8e18eb005de38e5c9858d13f0f772b5ae18c6b157
-set gpg_w32_version=2.3.6
-set gpg_w32_date=20220425
+set gpg_sha256=1a18adbb24868e14a40ccbd60003108840e238c0893e7bb6908805ae067eb0e8
+set gpg_exe_sha256=ac181fb744df2950880458f8e18eb005de38e5c9858d13f0f772b5ae18c6b157
+set gpg_version=2.3.6
+set gpg_date=20220425
+set gpg_name=gpg_win32
 
-set gpg_download_name=gnupg-w32-!gpg_w32_version!_!gpg_w32_date!
+set gpg_download_name=gnupg-w32-!gpg_version!_!gpg_date!
 set gpg_download_file=!gpg_download_name!.exe
 set gpg_download_path=!downloads_dir!\!gpg_download_file!
 set gpg_download_url="https://gnupg.org/ftp/gcrypt/binary/!gpg_download_file!"
 
-set gpg_w32_dir_name=gpg_win32_!gpg_w32_version!
-set gpg_w32_dir=!tools_dir!\!gpg_w32_dir_name!
-set gpg_w32_bin_dir=!gpg_w32_dir!\bin
-set gpg_w32_exe=!gpg_w32_bin_dir!\gpg.exe
+set gpg_dir_name=!gpg_name!_!gpg_version!
+set gpg_dir=!tools_dir!\!gpg_dir_name!
+set gpg_bin_dir=!gpg_dir!\bin
+set gpg_exe=!gpg_bin_dir!\gpg.exe
 
-if not exist "!gpg_w32_exe!" (
-    call win_helpers.bat :DownloadFile "!gpg_download_url!" "!gpg_w32_download_path!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!gpg_w32_download_path!" "!gpg_w32_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!gpg_w32_download_path!" "!gpg_w32_dir!" || exit /B %ERRORLEVEL%
+if not exist "!gpg_exe!" (
+    call win_helpers.bat :DownloadFile "!gpg_download_url!" "!gpg_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!gpg_download_path!" "!gpg_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!gpg_download_path!" "!gpg_dir!" || exit /B %ERRORLEVEL%
 )
 
-call win_helpers.bat :FileHashCheck sha256 "!gpg_w32_exe!" "!gpg_w32_exe_sha256!" || exit /B %ERRORLEVEL%
-set PATH="!gpg_w32_bin_dir!";!PATH!
+call win_helpers.bat :FileHashCheck sha256 "!gpg_exe!" "!gpg_exe_sha256!" || exit /B %ERRORLEVEL%
+set PATH="!gpg_bin_dir!";!PATH!
 
 REM Terminal
-echo set PATH=%%~dp0!gpg_w32_dir_name!\bin;%%PATH%%>> "!tmp_terminal_script!"
+call win_helpers.bat :MakeDirHardLink "!tools_dir!\!gpg_name!" "!gpg_dir!" || exit /B %ERRORLEVEL%
+echo set PATH=%%~dp0!gpg_dir_name!\bin;%%PATH%%>> "!tmp_terminal_script!"
 
 REM Application Setup
 REM ----------------------------------------------------------------------------
@@ -127,42 +131,45 @@ REM ----------------------------------------------------------------------------
 set wezterm_sha256=c634e98fa9715766bbb00cbc3c8a23d1d558c8cd5716ad2efca45ed4e0ef82f9
 set wezterm_exe_sha256=b9b5bae20d0679127ca0c4da276dff3b7b32310bfbfaede26a9b8ecb55e295ce
 set wezterm_version=20220408-101518-b908e2dd
+set wezterm_name=wezterm_win64
 
 set wezterm_download_name=WezTerm-windows-!wezterm_version!
 set wezterm_download_file=!wezterm_download_name!.zip
 set wezterm_download_path=!downloads_dir!\!wezterm_download_file!
 set wezterm_download_url="https://github.com/wez/wezterm/releases/download/!wezterm_version!/!wezterm_download_file!"
 
-set wezterm_dir_name=wezterm_win64_!wezterm_version!
+set wezterm_dir_name=!wezterm_name!_!wezterm_version!
 set wezterm_dir=!tools_dir!\!wezterm_dir_name!
-set wezterm_exe=!wezterm_dir!\wezterm-gui.exe
+set wezterm_version_exe=!wezterm_dir!\wezterm-gui.exe
 
-if not exist "!wezterm_exe!" (
+if not exist "!wezterm_version_exe!" (
     call win_helpers.bat :DownloadFile "!wezterm_download_url!" "!wezterm_download_path!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :FileHashCheck sha256 "!wezterm_download_path!" "!wezterm_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!wezterm_download_path!" "!wezterm_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_version_exe!" "!wezterm_download_path!" "!wezterm_dir!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :MoveDir "!wezterm_dir!\!wezterm_download_Name!" "!wezterm_dir!" || exit /B %ERRORLEVEL%
 )
 
-call win_helpers.bat :FileHashCheck sha256 "!wezterm_exe!" "!wezterm_exe_sha256!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :FileHashCheck sha256 "!wezterm_version_exe!" "!wezterm_exe_sha256!" || exit /B %ERRORLEVEL%
 call win_helpers.bat :OverwriteCopy "!installer_dir!\os_wezterm.lua" "!wezterm_dir!\wezterm.lua" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeDirHardLink "!tools_dir!\!wezterm_name!" "!wezterm_dir!" || exit /B %ERRORLEVEL%
 
 REM Jetbrains Mono Font
 REM ----------------------------------------------------------------------------
 set jetbrains_mono_sha256=4e315b4ef176ce7ffc971b14997bdc8f646e3d1e5b913d1ecba3a3b10b4a1a9f
 set jetbrains_mono_file_sha256=50e1dcb40298fcfcc21a1ef3cbee9fe9e82709c48ad30ce617472c06a3bd9436
 set jetbrains_mono_version=2.242
+set jetbrains_mono_name=jetbrains_mono
 
-set jetbrains_download_name=JetBrainsMono-!jetbrains_mono_version!
-set jetbrains_download_file=!jetbrains_download_name!.zip
-set jetbrains_download_path=!downloads_dir!\!jetbrains_download_file!
-set jetbrains_download_url="https://download.jetbrains.com/fonts/!jetbrains_download_file!"
+set jetbrains_mono_download_name=JetBrainsMono-!jetbrains_mono_version!
+set jetbrains_mono_download_file=!jetbrains_mono_download_name!.zip
+set jetbrains_mono_download_path=!downloads_dir!\!jetbrains_mono_download_file!
+set jetbrains_mono_download_url="https://download.jetbrains.com/fonts/!jetbrains_mono_download_file!"
 
-set jetbrains_mono_dir=!tools_dir!\jetbrains_mono_!jetbrains_mono_version!
+set jetbrains_mono_dir=!tools_dir!\!jetbrains_mono_name!_!jetbrains_mono_version!
 set jetbrains_mono_file=!jetbrains_mono_dir!\fonts\ttf\JetBrainsMono-Regular.ttf
 
 if not exist "!jetbrains_mono_file!" (
-    call win_helpers.bat :DownloadFile "!jetbrains_download_url!" "!jetbrains_mono_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!jetbrains_mono_download_url!" "!jetbrains_mono_download_path!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :FileHashCheck sha256 "!jetbrains_mono_download_path!" "!jetbrains_mono_sha256!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :Unzip "!zip7_exe!" "!jetbrains_mono_download_path!" "!jetbrains_mono_dir!" || exit /B %ERRORLEVEL%
 )
@@ -198,7 +205,9 @@ for %%a in (%cmake_version_list%) do (
     set cmake_download_path=!downloads_dir!\!cmake_download_file!
     set cmake_download_url="https://github.com/Kitware/CMake/releases/download/v!cmake_version!/!cmake_download_file!"
 
-    set cmake_dir_name=cmake_win64_!cmake_version!
+    set cmake_name=cmake_win64
+
+    set cmake_dir_name=!cmake_name!_!cmake_version!
     set cmake_dir=!tools_dir!\!cmake_dir_name!
     set cmake_bin_dir=!cmake_dir!\bin
     set cmake_exe=!cmake_bin_dir!\cmake.exe
@@ -211,8 +220,10 @@ for %%a in (%cmake_version_list%) do (
     )
 
     call win_helpers.bat :FileHashCheck sha256 "!cmake_exe!" "!cmake_exe_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :MakeRelativeBatchShortcut "cmake-!cmake_version!" "..\!cmake_dir_name!\bin\cmake.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MakeFileHardLink "!bin_dir!\cmake-!cmake_version!.exe" "!cmake_exe!" || exit /B %ERRORLEVEL%
 )
+
+call win_helpers.bat :MakeDirHardLink "!tools_dir!/!cmake_name!" "!cmake_dir!" || exit /B %ERRORLEVEL%
 echo set PATH=%%~dp0!cmake_dir_name!\bin;%%PATH%%>> "!tmp_terminal_script!"
 
 REM ctags
@@ -220,13 +231,14 @@ REM ----------------------------------------------------------------------------
 set ctags_sha256=B82648E9A3B2C8E50E0283A47B4F013F1B52E0F0E56DBB4F1C805D17578C4DF2
 set ctags_exe_sha256=7465E2D34EAF5F901AC45D7E9ED4AC8E7D3A532964D0D77A94F2D0EE3AE145AA
 set ctags_version=p5.9.20220612.0
+set ctags_name=ctags_win64
 
 set ctags_download_name=ctags-!ctags_version!-x64
 set ctags_download_file=!ctags_download_name!.zip
 set ctags_download_path=!downloads_dir!\!ctags_download_file!
 set ctags_download_url="https://github.com/universal-ctags/ctags-win32/releases/download/!ctags_version!/!ctags_download_file!"
 
-set ctags_dir_name=ctags_win64_!ctags_version!
+set ctags_dir_name=!ctags_name!_!ctags_version!
 set ctags_dir=!tools_dir!\!ctags_dir_name!
 set ctags_exe=!ctags_dir!\ctags.exe
 
@@ -237,20 +249,22 @@ if not exist "!ctags_exe!" (
     call win_helpers.bat :MoveDir "!ctags_dir!/ctags-!ctags_version!-windows-x86_64" "!ctags_dir!" || exit /B %ERRORLEVEL%
 )
 call win_helpers.bat :FileHashCheck sha256 "!ctags_exe!" "!ctags_exe_sha256!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeRelativeBatchShortcut "ctags" "..\!ctags_dir_name!\ctags.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeFileHardLink "!bin_dir!\ctags.exe" "!ctags_exe!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeDirHardLink "!tools_dir!\!ctags_name!" "!ctags_dir!" || exit /B %ERRORLEVEL%
 
 REM doxygen
 REM ----------------------------------------------------------------------------
 set doxygen_md5=266a2b66914d0d1d96cc97e9f740b74c
 set doxygen_exe_sha256=3CB4D89F2B3DB7EEC2B6797DC6B49CDFE9ADDA954575898895260F66F312D730
 set doxygen_version=1.9.4
+set doxygen_name=doxygen_win64
 
 set doxygen_download_name=doxygen-!doxygen_version!.windows.x64.bin
 set doxygen_download_file=!doxygen_download_name!.zip
 set doxygen_download_path=!downloads_dir!\!doxygen_download_file!
 set doxygen_download_url="https://www.doxygen.nl/files/!doxygen_download_file!"
 
-set doxygen_dir_name=doxygen_win64_!doxygen_version!
+set doxygen_dir_name=!doxygen_name!_!doxygen_version!
 set doxygen_dir=!tools_dir!\!doxygen_dir_name!
 set doxygen_exe=!doxygen_dir!\doxygen.exe
 
@@ -260,13 +274,15 @@ if not exist "!doxygen_exe!" (
     call win_helpers.bat :Unzip "!zip7_exe!" "!doxygen_download_path!" "!doxygen_dir!" || exit /B %ERRORLEVEL%
 )
 call win_helpers.bat :FileHashCheck sha256 "!doxygen_exe!" "!doxygen_exe_sha256!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeRelativeBatchShortcut "doxygen" "..\!doxygen_dir_name!\doxygen.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeFileHardLink "!bin_dir!\doxygen.exe" "!doxygen_exe!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeDirHardLink "!tools_dir!\!doxygen_name!" "!doxygen_dir!" || exit /B %ERRORLEVEL%
 
 REM Git
 REM ----------------------------------------------------------------------------
 set git_sha256=cdcdb268aaed1dd2ac33d1dfdaf105369e3d7bd8d84d641d26d30b34e706b843
 set git_exe_sha256=6C4DBB77D05CA5C482CE3782255F56BB904445809F1DF3B655E2505EAC7FA0B2
 set git_version=2.38.1
+set git_name_=portable_git_win64
 
 set git_download_name=PortableGit-!git_version!-64-bit.7z
 set git_download_file=!git_download_name!.exe
@@ -275,7 +291,7 @@ set git_download_url="https://github.com/git-for-windows/git/releases/download/v
 
 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_name=PortableGit_win64_!git_version!
+set git_install_dir_name=!git_name_!_!git_version!
 set git_install_dir=!tools_dir!\!git_install_dir_name!
 set git_exe=!git_install_dir!\cmd\git.exe
 
@@ -286,11 +302,12 @@ if not exist "!git_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!git_exe!" "!git_exe_sha256!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeDirHardLink "!tools_dir!\!git_name_!" "!git_install_dir!" || exit /B %ERRORLEVEL%
 
 REM Terminal
-echo set PATH=%%~dp0!git_install_dir_name!\cmd;%%PATH%%>> "!tmp_terminal_script!"
-echo set PATH=%%~dp0!git_install_dir_name!\mingw64\bin;%%PATH%%>> "!tmp_terminal_script!"
-echo set PATH=%%~dp0!git_install_dir_name!\usr\bin;%%PATH%%>> "!tmp_terminal_script!"
+echo set PATH=%%~dp0!git_name_!\cmd;%%PATH%%>> "!tmp_terminal_script!"
+echo set PATH=%%~dp0!git_name_!\mingw64\bin;%%PATH%%>> "!tmp_terminal_script!"
+echo set PATH=%%~dp0!git_name_!\usr\bin;%%PATH%%>> "!tmp_terminal_script!"
 
 REM GCC/MinGW for 32/64bit ARM
 REM ----------------------------------------------------------------------------
@@ -334,8 +351,8 @@ for %%a in (%gcc_mingw_arm_version_list%) do (
         )
 
         call win_helpers.bat :FileHashCheck sha256 "!gcc_mingw_arm_exe!" "!gcc_mingw_arm_exe_sha256!" || exit /B %ERRORLEVEL%
-        call win_helpers.bat :MakeRelativeBatchShortcut "!gcc_mingw_arm_arch!-gcc-!gcc_mingw_arm_version!" "..\!gcc_mingw_arm_dir_name!\bin\!gcc_mingw_arm_arch!-gcc.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
-        call win_helpers.bat :MakeRelativeBatchShortcut "!gcc_mingw_arm_arch!-g++-!gcc_mingw_arm_version!" "..\!gcc_mingw_arm_dir_name!\bin\!gcc_mingw_arm_arch!-g++.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
+        call win_helpers.bat :MakeFileHardLink "!bin_dir!\!gcc_mingw_arm_arch!-gcc-!gcc_mingw_arm_version!.exe" "!gcc_mingw_arm_dir!\bin\!gcc_mingw_arm_arch!-gcc.exe" || exit /B %ERRORLEVEL%
+        call win_helpers.bat :MakeFileHardLink "!bin_dir!\!gcc_mingw_arm_arch!-g++-!gcc_mingw_arm_version!.exe" "!gcc_mingw_arm_dir!\bin\!gcc_mingw_arm_arch!-g++.exe" || exit /B %ERRORLEVEL%
     )
 )
 
@@ -382,10 +399,13 @@ for %%a in (%gcc_version_list%) do (
     )
 
     call win_helpers.bat :FileHashCheck sha256 "!gcc_exe!" "!gcc_exe_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :MakeRelativeBatchShortcut "gcc-!gcc_version!" "..\!gcc_dir_name!\bin\gcc.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :MakeRelativeBatchShortcut "g++-!gcc_version!" "..\!gcc_dir_name!\bin\g++.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MakeFileHardLink "!bin_dir!\gcc-!gcc_version!.exe" "!gcc_bin_dir!\gcc.exe" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MakeFileHardLink "!bin_dir!\g++-!gcc_version!.exe" "!gcc_bin_dir!\g++.exe" || exit /B %ERRORLEVEL%
 )
 
+call win_helpers.bat :MakeFileHardLink "!bin_dir!\gcc.exe" "!gcc_bin_dir!\gcc.exe" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeFileHardLink "!bin_dir!\g++.exe" "!gcc_bin_dir!\g++.exe" || exit /B %ERRORLEVEL%
+
 REM Terminal
 echo set PATH=%%~dp0!gcc_dir_name!\bin;%%PATH%%>> "!tmp_terminal_script!"
 
@@ -435,11 +455,15 @@ for %%a in (%llvm_version_list%) do (
     )
 
     call win_helpers.bat :FileHashCheck sha256 "!llvm_exe!" "!llvm_exe_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :MakeRelativeBatchShortcut "clang-!llvm_version!"    "..\!llvm_dir_name!\bin\clang.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :MakeRelativeBatchShortcut "clang++-!llvm_version!"  "..\!llvm_dir_name!\bin\clang++.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :MakeRelativeBatchShortcut "clang-cl-!llvm_version!" "..\!llvm_dir_name!\bin\clang-cl.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MakeFileHardLink "!bin_dir!\clang-!llvm_version!.exe"    "!llvm_bin_dir!\clang.exe" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MakeFileHardLink "!bin_dir!\clang++-!llvm_version!.exe"  "!llvm_bin_dir!\clang++.exe" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :MakeFileHardLink "!bin_dir!\clang-cl-!llvm_version!.exe" "!llvm_bin_dir!\clang-cl.exe" || exit /B %ERRORLEVEL%
 )
 
+call win_helpers.bat :MakeFileHardLink "!bin_dir!\clang.exe"    "!llvm_bin_dir!\clang.exe" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeFileHardLink "!bin_dir!\clang++.exe"  "!llvm_bin_dir!\clang++.exe" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeFileHardLink "!bin_dir!\clang-cl.exe" "!llvm_bin_dir!\clang-cl.exe" || exit /B %ERRORLEVEL%
+
 REM Clang Format
 set clang_format=!home_dir!\clang-format.py
 call win_helpers.bat :OverwriteCopy "!llvm_dir!\share\clang\clang-format.py" "!clang_format!" || exit /B %ERRORLEVEL%
@@ -447,43 +471,19 @@ call win_helpers.bat :OverwriteCopy "!llvm_dir!\share\clang\clang-format.py" "!c
 REM Terminal
 echo set PATH=%%~dp0!llvm_dir_name!\bin;%%PATH%%>> "!tmp_terminal_script!"
 
-REM MinGW64
-REM ------------------------------------------------------------------------
-set mingw_sha256=853970527b5de4a55ec8ca4d3fd732c00ae1c69974cc930c82604396d43e79f8
-set mingw_exe_sha256=c5f0953f7a71ddcdf0852e1e44a43cef9b8fe121beba4d4202bfe6d405de47c0
-set mingw_version=8.1.0
-
-set mingw_download_name=x86_64-!mingw_version!-release-posix-seh-rt_v6-rev0
-set mingw_download_file=!mingw_download_name!.7z
-set mingw_download_path=!downloads_dir!\!mingw_download_file!
-set mingw_download_url="https://sourceforge.net/projects/mingw-w64/files/Toolchains targetting Win64/Personal Builds/mingw-builds/!mingw_version!/threads-posix/seh/!mingw_download_file!\"
-
-set mingw_dir_name=mingw64-posix-seg-rt_v6-rev0_win64_!mingw_version!
-set mingw_dir=!tools_dir!\!mingw_dir_name!
-set mingw_bin_dir=!mingw_dir!\bin
-set mingw_exe=!mingw_bin_dir!\gcc.exe
-
-if not exist "!mingw_exe!" (
-    call win_helpers.bat :DownloadFile \"!mingw_download_url!\" !ming_download_path! || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 !ming_download_path! !mingw_sha256! || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" !ming_download_path! !mingw_dir! || exit /B %ERRORLEVEL%
-    call win_helpers.bat :MoveDir !mingw_dir!\mingw64 !mingw_dir! || exit /B %ERRORLEVEL%
-)
-
-call win_helpers.bat :FileHashCheck sha256 "!mingw_exe!" "!mingw_exe_sha256!" || exit /B %ERRORLEVEL%
-
 REM ninja
 REM ----------------------------------------------------------------------------
 set ninja_sha256=524B344A1A9A55005EAF868D991E090AB8CE07FA109F1820D40E74642E289ABC
 set ninja_exe_sha256=23E7D60C17B3FCD42D9C00D49ECA3C3771B04D7CCB13E49836B06B34E20211C7
 set ninja_version=1.11.1
+set ninja_name=ninja_win64
 
 set ninja_download_name=ninja-win
 set ninja_download_file=!ninja_download_name!.zip
 set ninja_download_path=!downloads_dir!\!ninja_download_file!
 set ninja_download_url="https://github.com/ninja-build/ninja/releases/download/v!ninja_version!/!ninja_download_file!"
 
-set ninja_dir_name=ninja_win64_!ninja_version!
+set ninja_dir_name=!ninja_name!_!ninja_version!
 set ninja_dir=!tools_dir!\!ninja_dir_name!
 set ninja_exe=!ninja_dir!\ninja.exe
 
@@ -494,25 +494,21 @@ if not exist "!ninja_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!ninja_exe!" "!ninja_exe_sha256!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeRelativeBatchShortcut "ninja" "..\!ninja_dir_name!\ninja.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
-
-REM Terminal
-REM NOTE: We directly link to the ninja directory because CMake struggles to
-REM find ninja if not.
-echo set PATH=%%~dp0!ninja_dir_name!;%%PATH%%>> "!tmp_terminal_script!"
+call win_helpers.bat :MakeFileHardLink "!bin_dir!\ninja.exe" "!ninja_exe!" || exit /B %ERRORLEVEL%
 
 REM nodejs
 REM ----------------------------------------------------------------------------
 set nodejs_sha256=f7b0e8b0bfcfad7d62eba16fa4db9f085983c12c661bd4c66d8e3bd783befa65
 set nodejs_exe_sha256=7f33cbe04cb2940427e6dd97867c1fcf3ddd60911d2ae0260da3cab9f6ea6365
 set nodejs_version=16.7.0
+set nodejs_name=nodejs_win64
 
 set nodejs_download_name=node-v!nodejs_version!-win-x64
 set nodejs_download_file=!nodejs_download_name!.7z
 set nodejs_download_path=!downloads_dir!\!nodejs_download_file!
 set nodejs_download_url="https://nodejs.org/dist/v!nodejs_version!/!nodejs_download_file!"
 
-set nodejs_dir_name=nodejs_win64_!nodejs_version!
+set nodejs_dir_name=!nodejs_name!_!nodejs_version!
 set nodejs_dir=!tools_dir!\!nodejs_dir_name!
 set nodejs_exe=!nodejs_dir!\node.exe
 
@@ -524,6 +520,7 @@ if not exist "!nodejs_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!nodejs_exe!" "!nodejs_exe_sha256!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeDirHardLink "!tools_dir!\!nodejs_name!" "!nodejs_dir!" || exit /B %ERROR_LEVEL%
 
 REM Terminal
 echo set PATH=%%~dp0!nodejs_dir_name!;%%PATH%%>> "!tmp_terminal_script!"
@@ -534,17 +531,17 @@ REM We use the shared installation of python since pynvim/greenlet does not work
 REM with a static python distribution.
 set python_sha256=39EE2B12AAB9E07E2B3CE698331160C55C75CD4AFFEE028F6AE78020711D503C
 set python_exe_sha256=8677FBA3EFC27F51EA84C528B24E5824B580CE59CD5714C47073FF2459637687
-
 set python_date=20220630
 set python_version=3.9.13
 set python_version_and_date=!python_version!+!python_date!
+set python_name=cpython3_win64
 
 set python_download_name=cpython-!python_version_and_date!-x86_64-pc-windows-msvc-shared-install_only
 set python_download_file=!python_download_name!.tar.gz
 set python_download_path=!downloads_dir!\!python_download_file!
 set python_download_url="https://github.com/indygreg/python-build-standalone/releases/download/!python_date!/!python_download_file!"
 
-set python_dir_name=cpython_win64_!python_version_and_date!
+set python_dir_name=!python_name!_!python_version_and_date!
 set python_dir=!tools_dir!\!python_dir_name!
 set python_exe=!python_dir!\python.exe
 
@@ -557,23 +554,25 @@ if not exist "!python_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!python_exe!" "!python_exe_sha256!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeDirHardLink "!tools_dir!\!python_name!" "!python_dir!" || exit /B %ERROR_LEVEL%
 
 REM Terminal
-echo set PYTHONHOME=%%~dp0!python_dir_name!>> "!tmp_terminal_script!"
-echo set PATH=%%~dp0!python_dir_name!;%%PATH%%>> "!tmp_terminal_script!"
+echo set PYTHONHOME=%%~dp0!python_name!>> "!tmp_terminal_script!"
+echo set PATH=%%~dp0!python_name!;%%PATH%%>> "!tmp_terminal_script!"
 
 REM RenderDoc
 REM ----------------------------------------------------------------------------
 set renderdoc_sha256=ed1c1228b8fc30e53d3560dbae9d7bf47b85e0e15e30e6f3e4f36173a74f77bc
 set renderdoc_exe_sha256=3b4874f1677f08e4c329696eaa8281b7ee86b16ad5679932a72085a3e7abc658
 set renderdoc_version=1.19
+set renderdoc_name=renderdoc_win64
 
 set renderdoc_download_name=RenderDoc_!renderdoc_version!_64
 set renderdoc_download_file=!renderdoc_download_name!.zip
 set renderdoc_download_path=!downloads_dir!\!renderdoc_download_file!
 set renderdoc_download_url="https://renderdoc.org/stable/!renderdoc_version!/!renderdoc_download_file!"
 
-set renderdoc_dir=!tools_dir!\renderdoc_win64_!renderdoc_version!
+set renderdoc_dir=!tools_dir!\!renderdoc_name!_!renderdoc_version!
 set renderdoc_exe=!renderdoc_dir!\qrenderdoc.exe
 
 if not exist "!renderdoc_exe!" (
@@ -584,19 +583,21 @@ if not exist "!renderdoc_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!renderdoc_exe!" "!renderdoc_exe_sha256!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeDirHardLink "!tools_dir!\!renderdoc_name!" "!renderdoc_dir!" || exit /B %ERROR_LEVEL%
 
 REM Zeal
 REM ----------------------------------------------------------------------------
 set zeal_sha256=08e9992f620ba0a5ea348471d8ac9c85059e95eedd950118928be639746e3f94
 set zeal_exe_sha256=d1e687a33e117b6319210f40e2401b4a68ffeb0f33ef82f5fb6a31ce4514a423
 set zeal_version=0.6.1
+set zeal_name=zeal_win64
 
 set zeal_download_name=zeal-portable-!zeal_version!-windows-x64
 set zeal_download_file=!zeal_download_name!.7z
 set zeal_download_path=!downloads_dir!\!zeal_download_file!
 set zeal_download_url="https://github.com/zealdocs/zeal/releases/download/v!zeal_version!/!zeal_download_file!"
 
-set zeal_dir=!tools_dir!\zeal_win64_!zeal_version!
+set zeal_dir=!tools_dir!\!zeal_name!_!zeal_version!
 set zeal_exe=!zeal_dir!\zeal.exe
 
 if not exist "!zeal_exe!" (
@@ -607,6 +608,7 @@ if not exist "!zeal_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!zeal_exe!" "!zeal_exe_sha256!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeDirHardLink "!tools_dir!\!zeal_name!" "!zeal_dir!" || exit /B %ERROR_LEVEL%
 
 REM Zig
 REM ----------------------------------------------------------------------------
@@ -631,8 +633,8 @@ if not exist "!zig_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!zig_exe!" "!zig_exe_sha256!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeRelativeBatchShortcut "zig"               "..\!zig_dir_name!\zig.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeRelativeBatchShortcut "zig-!zig_version!" "..\!zig_dir_name!\zig.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeFileHardLink "!bin_dir!\zig-!zig_version!.exe" "!zig_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeFileHardLink "!bin_dir!\zig.exe"               "!zig_exe!" "!bin_dir!" || exit /B %ERRORLEVEL%
 
 REM MSVC
 REM ----------------------------------------------------------------------------
@@ -767,13 +769,14 @@ REM ----------------------------------------------------------------------------
 set dependencies_sha256=7d22dc00f1c09fd4415d48ad74d1cf801893e83b9a39944b0fce6dea7ceaea99
 set dependencies_exe_sha256=1737e5406128c3560bbb2bced3ac62d77998e592444f94b10cc0aa0bb1e617e6
 set dependencies_version=1.11.1
+set dependencies_name=dependencies_win64
 
 set dependencies_download_name=Dependencies_x64_Release
 set dependencies_download_file=!dependencies_download_name!.zip
 set dependencies_download_path=!downloads_dir!\!dependencies_download_file!
 set dependencies_download_url="https://github.com/lucasg/Dependencies/releases/download/v!dependencies_version!/!dependencies_download_file!"
 
-set dependencies_dir=!tools_dir!\dependencies_win64_!dependencies_version!
+set dependencies_dir=!tools_dir!\!dependencies_name!_!dependencies_version!
 set dependencies_exe=!dependencies_dir!\DependenciesGui.exe
 
 if not exist "!dependencies_exe!" (
@@ -783,29 +786,37 @@ if not exist "!dependencies_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!dependencies_exe!" "!dependencies_exe_sha256!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeDirHardLink "!tools_dir!\!dependencies_name!" "!dependencies_dir!" || exit /B %ERROR_LEVEL%
 
 REM everything (void tools search program)
 REM ----------------------------------------------------------------------------
-set everything_sha256=656ff3946222048a5558160023da6fd8abc6fa9569f7ac1dff058410a3db6f28
-set everything_exe_sha256=8f853443c0b0e8c144315a27d1e8bf1595bd09cb364393226accfe105c0a2c85
-set everything_version=1.4.1.1015
+set everything_sha256=844B6B8DBF202F6C91176589C4379EA51B39F8A85440F6EB97B8F56E59846759
+set everything_exe_sha256=9be6f6bd6a1d1fd528f63915d5373287b0c2abc38e588c19ae13225dde75dfa9
+set everything_version=1.5.0.1329a
+set everything_name=everything_win64
 
 set everything_download_name=Everything-!everything_version!.x64
 set everything_download_file=!everything_download_name!.zip
 set everything_download_path=!downloads_dir!\!everything_download_file!
 set everything_download_url="https://www.voidtools.com/!everything_download_file!"
 
-set everything_dir_name=everything_win64_!everything_version!
+set everything_dir_name=!everything_name!_!everything_version!
 set everything_dir=!tools_dir!\!everything_dir_name!
-set everything_exe=!everything_dir!\everything.exe
+set everything_exe=!everything_dir!\Everything64.exe
 
 if not exist "!everything_exe!" (
     call win_helpers.bat :DownloadFile "!everything_download_url!" "!everything_download_path!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :FileHashCheck sha256 "!everything_download_path!" "!everything_sha256!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :Unzip "!zip7_exe!" "!everything_download_path!" "!everything_dir!" || exit /B %ERRORLEVEL%
+
+    if exist "!tools_dir!/everything_win64" (
+        rmdir "!tools_dir!/everything_win64"
+        mklink /J "!tools_dir!/everything_win64" "!everything_dir!"
+    )
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!everything_exe!" "!everything_exe_sha256!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeDirHardLink "!tools_dir!\!everything_name!" "!everything_dir!" || exit /B %ERROR_LEVEL%
 
 REM fzf
 REM ----------------------------------------------------------------------------
@@ -829,7 +840,7 @@ if not exist "!fzf_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!fzf_exe!" "!fzf_exe_sha256!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeRelativeBatchShortcut "fzf" "..\fzf_win64_!fzf_version!.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeFileHardLink "!bin_dir!\fzf.exe" "!fzf_exe!" || exit /B %ERRORLEVEL%
 
 REM Terminal
 REM Use FD for FZF to make it ultra fast
@@ -841,13 +852,14 @@ REM ----------------------------------------------------------------------------
 set jpegview_sha256=82BA6F84A7D7C88C655253ACB41FFED9E8667CF1F3AC9573836952C08C4DC82C
 set jpegview_exe_sha256=1FFE58601AB160C57D01823FAC8BFEB36C1BFD782E6F60ADFA57EED6240B09B3
 set jpegview_version=1.0.40
+set jpegview_name=jpegview_win64
 
 set jpegview_download_name=JPEGView_!jpegview_version!
 set jpegview_download_file=!jpegview_download_name!.7z
 set jpegview_download_path=!downloads_dir!\!jpegview_download_file!
 set jpegview_download_url="https://github.com/sylikc/jpegview/releases/download/v!jpegview_version!/!jpegview_download_file!"
 
-set jpegview_dir_name=jpegview_win64_!jpegview_version!
+set jpegview_dir_name=!jpegview_name!_!jpegview_version!
 set jpegview_dir=!tools_dir!\!jpegview_dir_name!
 set jpegview_exe=!jpegview_dir!\JPEGView.exe
 
@@ -861,6 +873,7 @@ if not exist "!jpegview_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!jpegview_exe!" "!jpegview_exe_sha256!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeDirHardLink "!tools_dir!\!jpegview_name!" "!jpegview_dir!" || exit /B %ERROR_LEVEL%
 
 REM mpc_qt
 REM ----------------------------------------------------------------------------
@@ -868,13 +881,14 @@ set mpc_qt_sha256=2230c4f4de1a429ccc67e5c590efc0a86fbaffeb33a4dc5f391aa45e660b80
 set mpc_qt_exe_sha256=d7ee46b0d4a61a26f8acd5d5fd4da2d252d6bc80c5cab6a55db06e853f2acefb
 set mpc_qt_version=22.02
 set mpc_qt_version_no_dot=2202
+set mpc_qt_name=mpc-qt_win64
 
 set mpc_qt_download_name=mpc-qt-win-x64-!mpc_qt_version_no_dot!
 set mpc_qt_download_file=!mpc_qt_download_name!.zip
 set mpc_qt_download_path=!downloads_dir!\!mpc_qt_download_file!
 set mpc_qt_download_url="https://github.com/mpc-qt/mpc-qt/releases/download/v!mpc_qt_version!/!mpc_qt_download_file!"
 
-set mpc_qt_dir_name=mpc-qt_win64_!mpc_qt_version!
+set mpc_qt_dir_name=!mpc_qt_name!_!mpc_qt_version!
 set mpc_qt_dir=!tools_dir!\!mpc_qt_dir_name!
 set mpc_qt_exe=!mpc_qt_dir!\mpc-qt.exe
 
@@ -885,21 +899,24 @@ if not exist "!mpc_qt_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!mpc_qt_exe!" "!mpc_qt_exe_sha256!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeDirHardLink "!tools_dir!\!mpc_qt_name!" "!mpc_qt_dir!" || exit /B %ERROR_LEVEL%
 
 REM NVIM
 REM ----------------------------------------------------------------------------
 set nvim_sha256=a72a90e2897ea296b777c325a37c981a0b51e2fe0c8b8735e3366b65e958cddc
 set nvim_exe_sha256=E2B9B9C38EE169475EEAE4501278A36A93C7A4F08F6E5379CA65A166041B8DA8
 set nvim_version=0.7.0
+set nvim_name=nvim_win64
 
 set nvim_download_name=nvim-win64
 set nvim_download_file=!nvim_download_name!.zip
 set nvim_download_path=!downloads_dir!\!nvim_download_file!
 set nvim_download_url="https://github.com/neovim/neovim/releases/download/v!nvim_version!/!nvim_download_file!"
 
-set nvim_dir_name=nvim_win64_!nvim_version!
+set nvim_dir_name=!nvim_name!_!nvim_version!
 set nvim_dir=!tools_dir!\!nvim_dir_name!
-set nvim_exe=!nvim_dir!\bin\nvim.exe
+set nvim_bin_dir=!nvim_dir!\bin
+set nvim_exe=!nvim_bin_dir!\nvim.exe
 
 if not exist "!nvim_exe!" (
     call win_helpers.bat :DownloadFile "!nvim_download_url!" "!nvim_download_path!" || exit /B %ERRORLEVEL%
@@ -909,8 +926,11 @@ if not exist "!nvim_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!nvim_exe!" "!nvim_exe_sha256!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeRelativeBatchShortcut "nvim"    "..\!nvim_dir_name!\bin\nvim.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeRelativeBatchShortcut "nvim-qt" "..\!nvim_dir_name!\bin\nvim-qt.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeFileHardLink "!bin_dir!\nvim.exe" "!nvim_bin_dir!\nvim.exe" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeFileHardLink "!bin_dir!\nvim-qt.exe" "!nvim_bin_dir!\nvim-qt.exe" || exit /B %ERRORLEVEL%
+
+REM Terminal
+echo set PATH=%%~dp0!nvim_dir_name!\bin;%%PATH%%>> "!tmp_terminal_script!"
 
 REM Neovide
 REM ----------------------------------------------------------------------------
@@ -923,7 +943,7 @@ set neovide_download_file=!neovide_download_name!.zip
 set neovide_download_path=!downloads_dir!\!neovide_download_file!
 set neovide_download_url="https://github.com/neovide/neovide/releases/download/!neovide_version!/!neovide_download_file!"
 
-set neovide_dir=!tools_dir!\
+set neovide_dir=!tools_dir!
 set neovide_exe=!neovide_dir!\neovide_win64_!neovide_version!.exe
 
 if not exist "!neovide_exe!" (
@@ -934,7 +954,7 @@ if not exist "!neovide_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!neovide_exe!" "!neovide_exe_sha256!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeRelativeBatchShortcut "neovide" "..\neovide_win64_!neovide_version!.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeFileHardLink "!bin_dir!\neovide.exe" "!neovide_exe!" || exit /B %ERRORLEVEL%
 
 REM Vim Configuration
 REM ----------------------------------------------------------------------------
@@ -958,13 +978,14 @@ REM ----------------------------------------------------------------------------
 set imhex_sha256=080f537d3ea58c002cc2112adbec1352144710b43764de9a1dc04f129d3a3343
 set imhex_exe_sha256=6a4b0e70bf7c78af074af0de2346164d9f5aec28ea224f9ee903412e1c774d95
 set imhex_version=1.17.0
+set imhex_name=imhex_win64
 
 set imhex_download_name=Windows.Portable.ZIP
 set imhex_download_file=!imhex_download_name!.zip
 set imhex_download_path=!downloads_dir!\!imhex_download_file!
 set imhex_download_url="https://github.com/WerWolv/ImHex/releases/download/v!imhex_version!/!imhex_download_url!"
 
-set imhex_dir=!tools_dir!\imhex_win64_!imhex_version!
+set imhex_dir=!tools_dir!\!imhex_name!_!imhex_version!
 set imhex_exe=!imhex_dir!\imhex.exe
 
 if not exist "!imhex_exe!" (
@@ -974,19 +995,21 @@ if not exist "!imhex_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!imhex_exe!" "!imhex_exe_sha256!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeDirHardLink "!tools_dir!\!imhex_name!" "!imhex_dir!" || exit /B %ERRORLEVEL%
 
 REM Keypirinha
 REM ----------------------------------------------------------------------------
 set keypirinha_sha256=d109a16e6a5cf311abf6d06bbe5b1be3b9ba323b79c32a168628189e10f102a5
 set keypirinha_exe_sha256=2d3adb36a04e9fdf94636c9ac5d4c2b754accbfaecd81f4ee7189c3c0edc8af1
 set keypirinha_version=2.26
+set keypirinha_name=keypirinha_win64
 
 set keypirinha_download_name=keypirinha-!keypirinha_version!-x64-portable
 set keypirinha_download_file=!keypirinha_download_name!.7z
 set keypirinha_download_path=!downloads_dir!\!keypirinha_download_file!
 set keypirinha_download_url="https://github.com/Keypirinha/Keypirinha/releases/download/v!keypirinha_version!/!keypirinha_download_file!"
 
-set keypirinha_dir_name=keypirinha_win64_!keypirinha_version!
+set keypirinha_dir_name=!keypirinha_name!_!keypirinha_version!
 set keypirinha_dir=!tools_dir!\!keypirinha_dir_name!
 set keypirinha_exe=!keypirinha_dir!\keypirinha.exe
 
@@ -998,6 +1021,7 @@ if not exist "!keypirinha_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!keypirinha_exe!" "!keypirinha_exe_sha256!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeDirHardLink "!tools_dir!\!keypirinha_name!" "!keypirinha_dir!" || exit /B %ERRORLEVEL%
 
 REM Misc Tools
 REM ----------------------------------------------------------------------------
@@ -1014,13 +1038,14 @@ REM ------------------------------------------------------------------------
 set mobaxterm_sha256=91f80537f12c2ad34a5eba99a285c149781c6d35a144a965ce3aea8a9bc6868c
 set mobaxterm_exe_sha256=1053c81b44018d6e6519a9c80d7413f7bb36e9f6e43b3da619b2229aa362a522
 set mobaxterm_version=21.2
+set mobaxterm_name=mobaxterm_win64
 
 set mobaxterm_download_name=MobaXterm_Portable_v!mobaxterm_version!
 set mobaxterm_download_file=!mobaxterm_download_name!.zip
 set mobaxterm_download_path=!downloads_dir!\!mobaxterm_download_file!
 set mobaxterm_download_url="https://download.mobatek.net/2122021051924233/!mobaxterm_download_file!"
 
-set mobaxterm_dir=!tools_dir!\mobaxterm_win64_!mobaxterm_version!
+set mobaxterm_dir=!tools_dir!\!mobaxterm_name!_!mobaxterm_version!
 set mobaxterm_exe=!mobaxterm_dir!\MobaXterm_Personal_21.2.exe
 
 if not exist "!mobaxterm_exe!" (
@@ -1030,6 +1055,7 @@ if not exist "!mobaxterm_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!mobaxterm_exe!" "!mobaxterm_exe_sha256!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeDirHardLink "!tools_dir!\!mobaxterm_name!" "!mobaxterm_dir!" || exit /B %ERRORLEVEL%
 
 REM O&O ShutUp10 (Privacy Tool for Windows)
 REM ----------------------------------------------------------------------------
@@ -1048,13 +1074,14 @@ REM ----------------------------------------------------------------------------
 set process_hacker_sha256=c662b756324c9727760b4e921459d31a30f99cf8d3f24b64f4fcb3b29a26beb4
 set process_hacker_exe_sha256=22b1b8f080a41a07f23eae8ab0ad2e5f88d3c5af5d8c1cd1bb4f6856482e945c
 set process_hacker_version=3.0.4861
+set process_hacker_name=process_hacker_win64
 
 set process_hacker_download_name=processhacker-!process_hacker_version!-bin
 set process_hacker_download_file=!process_hacker_download_name!.zip
 set process_hacker_download_path=!downloads_dir!\!process_hacker_download_file!
 set process_hacker_download_url="https://github.com/ProcessHackerRepoTool/nightly-builds-mirror/releases/download/v!process_hacker_version!/!process_hacker_download_file!"
 
-set process_hacker_dir=!tools_dir!\process_hacker_win64_!process_hacker_version!
+set process_hacker_dir=!tools_dir!\!process_hacker_name!_!process_hacker_version!
 set process_hacker_exe=!process_hacker_dir!\64bit\ProcessHacker.exe
 
 if not exist "!process_hacker_exe!" (
@@ -1064,19 +1091,21 @@ if not exist "!process_hacker_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!process_hacker_exe!" "!process_hacker_exe_sha256!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeDirHardLink "!tools_dir!\!process_hacker_name!" "!process_hacker_dir!" || exit /B %ERRORLEVEL%
 
 REM ripgrep
 REM ----------------------------------------------------------------------------
 set rg_sha256=a47ace6f654c5ffa236792fc3ee3fefd9c7e88e026928b44da801acb72124aa8
 set rg_exe_sha256=ab5595a4f7a6b918cece0e7e22ebc883ead6163948571419a1dd5cd3c7f37972
 set rg_version=13.0.0
+set rg_name=ripgrep_win64
 
 set rg_download_name=ripgrep-!rg_version!-x86_64-pc-windows-msvc
 set rg_download_file=!rg_download_name!.zip
 set rg_download_path=!downloads_dir!\!rg_download_file!
-set rg_download_url="https://github.com/BurntSushi/ripgrep/releases/download/!rg_version!/!ripgrep_download_file!"
+set rg_download_url="https://github.com/BurntSushi/ripgrep/releases/download/!rg_version!/!rg_download_file!"
 
-set rg_dir_name=ripgrep_win64_!rg_version!
+set rg_dir_name=!rg_name!_!rg_version!
 set rg_dir=!tools_dir!\!rg_dir_name!
 set rg_exe=!rg_dir!\rg.exe
 
@@ -1088,22 +1117,21 @@ if not exist "!rg_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!rg_exe!" "!rg_exe_sha256!" || exit /B %ERRORLEVEL%
-
-REM Terminal
-echo set PATH=%%~dp0!rg_dir_name!;%%PATH%%>> "!tmp_terminal_script!"
+call win_helpers.bat :MakeFileHardLink "!bin_dir!\rg.exe" "!rg_exe!" || exit /B %ERRORLEVEL%
 
 REM sioyek (PDF Viewer)
 REM ----------------------------------------------------------------------------
 set sioyek_sha256=B9C1C02DDA4932E488DB6AA08417854FBA436B492C7261C6CF04AE2AF0329F66
 set sioyek_exe_sha256=A30306931FC5E97DAF72CF9A82C2DA1D994392CDBD5DF5C7F0D56C26FFC3A33E
 set sioyek_version=1.5.0
+set sioyek_name=sioyek_win64
 
 set sioyek_download_name=sioyek-release-windows-portable
 set sioyek_download_file=!sioyek_download_name!.zip
 set sioyek_download_path=!downloads_dir!\!sioyek_download_file!
 set sioyek_download_url="https://github.com/ahrm/sioyek/releases/download/v1.5.0/sioyek-release-windows-portable.zip"
 
-set sioyek_dir_name=sioyek_win64_!sioyek_version!
+set sioyek_dir_name=!sioyek_name!_!sioyek_version!
 set sioyek_dir=!tools_dir!\!sioyek_dir_name!
 set sioyek_exe=!sioyek_dir!\sioyek.exe
 
@@ -1115,19 +1143,21 @@ if not exist "!sioyek_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!sioyek_exe!" "!sioyek_exe_sha256!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeDirHardLink "!tools_dir!\!sioyek_name!" "!sioyek_dir!" || exit /B %ERRORLEVEL%
 
 REM fd
 REM ----------------------------------------------------------------------------
 set fd_sha256=F21BC26C1AB6BDBE4FE43F87A20C792D4ABE629AE97C6F42B25AC8A042F5521F
 set fd_exe_sha256=764F31AC5B477707B51DAEC32458E4D66059BA0D17F03032B7CD0C0534703354
 set fd_version=8.4.0
+set fd_name=fd_win64
 
-set fd_download_name=ripgrep-!fd_version!-x86_64-pc-windows-msvc
+set fd_download_name=fd-!fd_version!-x86_64-pc-windows-msvc
 set fd_download_file=!fd_download_name!.zip
 set fd_download_path=!downloads_dir!\!fd_download_file!
 set fd_download_url="https://github.com/sharkdp/fd/releases/download/!fd_version!/!fd_download_file!"
 
-set fd_dir_name=fd_win64_!fd_version!
+set fd_dir_name=!fd_name!_!fd_version!
 set fd_dir=!tools_dir!\!fd_dir_name!
 set fd_exe=!fd_dir!\fd.exe
 
@@ -1139,22 +1169,21 @@ if not exist "!fd_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!fd_exe!" "!fd_exe_sha256!" || exit /B %ERRORLEVEL%
-
-REM Terminal
-echo set PATH=%%~dp0!fd_dir_name!;%%PATH%%>> "!tmp_terminal_script!"
+call win_helpers.bat :MakeFileHardLink "!bin_dir!\fd.exe" "!fd_exe!" || exit /B %ERRORLEVEL%
 
 REM wiztree
 REM ----------------------------------------------------------------------------
 set wiztree_sha256=066E270DE1E398CC8447428047628C241832D53839AAE9815443B486AFFD66C9
 set wiztree_exe_sha256=688a21f225af918c47b883a0d905922411a63cbe55785aa4fbc16af244c1fcdf
 set wiztree_version=4_08
+set wiztree_name=wiztree_win64
 
 set wiztree_download_name=wiztree_!wiztree_version!_portable
 set wiztree_download_file=!wiztree_download_name!.zip
 set wiztree_download_path=!downloads_dir!\!wiztree_download_file!
 set wiztree_download_url="https://www.diskanalyzer.com/files/!wiztree_download_file!"
 
-set wiztree_dir=!tools_dir!\wiztree_win64_!wiztree_version!
+set wiztree_dir=!tools_dir!\!wiztree_name!_!wiztree_version!
 set wiztree_exe=!wiztree_dir!\wiztree64.exe
 
 if not exist "!wiztree_exe!" (
@@ -1164,6 +1193,7 @@ if not exist "!wiztree_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!wiztree_exe!" "!wiztree_exe_sha256!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeDirHardLink "!tools_dir!\!wiztree_name!" "!wiztree_dir!" || exit /B %ERRORLEVEL%
 
 REM Ethereum
 REM ----------------------------------------------------------------------------
@@ -1201,7 +1231,7 @@ if not exist "!geth_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!geth_exe!" "!geth_exe_sha256!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeRelativeBatchShortcut "geth" "..\!geth_dir_name!\geth.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeFileHardLink "!bin_dir!\geth.exe" "!geth_exe!" || exit /B %ERRORLEVEL%
 
 REM remix_ide
 REM ----------------------------------------------------------------------------
@@ -1244,13 +1274,14 @@ if not exist "!solidity_exe!" (
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!solidity_exe!" "!solidity_exe_sha256!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeRelativeBatchShortcut "solc" "..\solidity_win64_!solidity_version!.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeRelativeBatchShortcut "solc-!solidity_version!" "..\solidity_win64_!solidity_version!.exe" "!bin_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeFileHardLink "!bin_dir!\solc" "!solidity_exe!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeFileHardLink "!bin_dir!\solc-!solidity_version!" "!solidity_exe!" || exit /B %ERRORLEVEL%
+
 
 REM Finish Terminal Script
 REM ----------------------------------------------------------------------------
 echo if exist "%%~dp0win_terminal_user_config.bat" call "%%~dp0win_terminal_user_config.bat">> "!tmp_terminal_script!"
-echo start "" /MAX "%%~dp0!wezterm_dir_name!\wezterm-gui.exe">> "!tmp_terminal_script!"
+echo start "" /MAX "%%~dp0!wezterm_name!\wezterm-gui.exe">> "!tmp_terminal_script!"
 echo exit>> "!tmp_terminal_script!"
 move /Y !tmp_terminal_script! !terminal_script!
 
@@ -1279,8 +1310,8 @@ REM Background Application Scripts
 REM ----------------------------------------------------------------------------
 set bg_app_script=!tools_dir!\win_start_background_apps.bat
 echo @echo off> "!bg_app_script!"
-echo start "" "%%~dp0!everything_dir_name!\everything.exe">> "!bg_app_script!"
-echo start "" "%%~dp0!keypirinha_dir_name!\keypirinha.exe">> "!bg_app_script!"
+echo start "" "%%~dp0!everything_name!\everything.exe">> "!bg_app_script!"
+echo start "" "%%~dp0!keypirinha_name!\keypirinha.exe">> "!bg_app_script!"
 
 REM CTags Helper Script
 REM ----------------------------------------------------------------------------

From 55fd43c6f53afaf6b3611666a7d76c167e1306e6 Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Wed, 16 Nov 2022 19:54:12 +1100
Subject: [PATCH 31/41] win: New everything exe name, fix wezterm vars, fix
 ctags

---
 win_install.bat | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/win_install.bat b/win_install.bat
index c81ab6f..4fcb470 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -140,16 +140,16 @@ set wezterm_download_url="https://github.com/wez/wezterm/releases/download/!wezt
 
 set wezterm_dir_name=!wezterm_name!_!wezterm_version!
 set wezterm_dir=!tools_dir!\!wezterm_dir_name!
-set wezterm_version_exe=!wezterm_dir!\wezterm-gui.exe
+set wezterm_exe=!wezterm_dir!\wezterm-gui.exe
 
-if not exist "!wezterm_version_exe!" (
+if not exist "!wezterm_exe!" (
     call win_helpers.bat :DownloadFile "!wezterm_download_url!" "!wezterm_download_path!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :FileHashCheck sha256 "!wezterm_download_path!" "!wezterm_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_version_exe!" "!wezterm_download_path!" "!wezterm_dir!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!wezterm_download_path!" "!wezterm_dir!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :MoveDir "!wezterm_dir!\!wezterm_download_Name!" "!wezterm_dir!" || exit /B %ERRORLEVEL%
 )
 
-call win_helpers.bat :FileHashCheck sha256 "!wezterm_version_exe!" "!wezterm_exe_sha256!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :FileHashCheck sha256 "!wezterm_exe!" "!wezterm_exe_sha256!" || exit /B %ERRORLEVEL%
 call win_helpers.bat :OverwriteCopy "!installer_dir!\os_wezterm.lua" "!wezterm_dir!\wezterm.lua" || exit /B %ERRORLEVEL%
 call win_helpers.bat :MakeDirHardLink "!tools_dir!\!wezterm_name!" "!wezterm_dir!" || exit /B %ERRORLEVEL%
 
@@ -246,7 +246,6 @@ if not exist "!ctags_exe!" (
     call win_helpers.bat :DownloadFile "!ctags_download_url!" "!ctags_download_path!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :FileHashCheck sha256 "!ctags_download_path!" "!ctags_sha256!" || exit /B %ERRORLEVEL%
     call win_helpers.bat :Unzip "!zip7_exe!" "!ctags_download_path!" "!ctags_dir!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :MoveDir "!ctags_dir!/ctags-!ctags_version!-windows-x86_64" "!ctags_dir!" || exit /B %ERRORLEVEL%
 )
 call win_helpers.bat :FileHashCheck sha256 "!ctags_exe!" "!ctags_exe_sha256!" || exit /B %ERRORLEVEL%
 call win_helpers.bat :MakeFileHardLink "!bin_dir!\ctags.exe" "!ctags_exe!" || exit /B %ERRORLEVEL%
@@ -1310,7 +1309,7 @@ REM Background Application Scripts
 REM ----------------------------------------------------------------------------
 set bg_app_script=!tools_dir!\win_start_background_apps.bat
 echo @echo off> "!bg_app_script!"
-echo start "" "%%~dp0!everything_name!\everything.exe">> "!bg_app_script!"
+echo start "" "%%~dp0!everything_name!\everything64.exe">> "!bg_app_script!"
 echo start "" "%%~dp0!keypirinha_name!\keypirinha.exe">> "!bg_app_script!"
 
 REM CTags Helper Script

From 5e991fb1deac15992eab8c1173bf676cdf277343 Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Wed, 16 Nov 2022 23:10:05 +1100
Subject: [PATCH 32/41] win: Fix script on cold install, update some QoL deps

---
 win_install.bat | 53 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 18 deletions(-)

diff --git a/win_install.bat b/win_install.bat
index 4fcb470..0d8788c 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -19,12 +19,23 @@ if not exist !bin_dir! mkdir !bin_dir!
 set tmp_terminal_script=!tools_dir!\win_terminal.bat.tmp
 set terminal_script=!tools_dir!\win_terminal.bat
 echo @echo off> "!tmp_terminal_script!"
+echo setlocal EnableDelayedExpansion>> "!tmp_terminal_script!"
+
+echo.>> "!tmp_terminal_script!"
+echo set working_dir=>> "!tmp_terminal_script!"
+echo if "%%~1" neq "" (>> "!tmp_terminal_script!"
+echo     set working_dir=start --cwd "%%~1">> "!tmp_terminal_script!"
+echo     set working_dir=^^!working_dir:\=/^^!>> "!tmp_terminal_script!"
+echo )>> "!tmp_terminal_script!"
+echo.>> "!tmp_terminal_script!"
+
 echo set HOME=%%~dp0..\Home>> "!tmp_terminal_script!"
 echo set HOMEPATH=%%~dp0..\Home>> "!tmp_terminal_script!"
 echo set USERPROFILE=%%~dp0..\Home>> "!tmp_terminal_script!"
 echo set APPDATA=%%~dp0..\Home\AppData>> "!tmp_terminal_script!"
 echo set LOCALAPPDATA=%%~dp0..\Home\AppData\Local>> "!tmp_terminal_script!"
 echo set PATH=%%~dp0Binaries;%%PATH%%>> "!tmp_terminal_script!"
+echo.>> "!tmp_terminal_script!"
 
 REM Setup tools for setting up the development environment
 REM ----------------------------------------------------------------------------
@@ -261,7 +272,7 @@ set doxygen_name=doxygen_win64
 set doxygen_download_name=doxygen-!doxygen_version!.windows.x64.bin
 set doxygen_download_file=!doxygen_download_name!.zip
 set doxygen_download_path=!downloads_dir!\!doxygen_download_file!
-set doxygen_download_url="https://www.doxygen.nl/files/!doxygen_download_file!"
+set doxygen_download_url="https://downloads.sourceforge.net/project/doxygen/rel-!doxygen_version!/!doxygen_download_file!"
 
 set doxygen_dir_name=!doxygen_name!_!doxygen_version!
 set doxygen_dir=!tools_dir!\!doxygen_dir_name!
@@ -652,7 +663,9 @@ REM demand in this script.
 call !msvc_dir!\setup.bat
 
 REM Terminal
+echo.>> "!tmp_terminal_script!"
 echo call "%%~dp0!msvc_dir_name!\setup.bat">> "!tmp_terminal_script!"
+echo.>> "!tmp_terminal_script!"
 
 REM Symget
 REM ----------------------------------------------------------------------------
@@ -669,7 +682,7 @@ for /F "tokens=1 USEBACKQ" %%F IN (`"!git_exe!" -C !symget_dir! rev-parse --shor
 set symget_curr_git_hash=!symget_curr_git_hash:~0,-1!
 
 if !symget_curr_git_hash! neq !symget_git_hash! (
-    call "!git_exe!" -C "!symget_dir!" pull origin master || exit /B %ERRORLEVEL%
+    call "!git_exe!" -C "!symget_dir!" pull origin main || exit /B %ERRORLEVEL%
     call "!git_exe!" -C "!symget_dir!" checkout "!symget_git_hash!" || exit /B %ERRORLEVEL%
     if exist "!symget_exe!" del /F "!symget_exe!"
 )
@@ -713,6 +726,8 @@ call win_helpers.bat :MakeRelativeBatchShortcut "odin" "..\!odin_dir_name!\odin.
 
 REM QoL/Tools
 REM ----------------------------------------------------------------------------
+echo.>> "!tmp_terminal_script!"
+
 REM clink - Bash style tab completion in terminal
 REM ----------------------------------------------------------------------------
 set clink_sha256=6FD44B1D085ABC8319108986C0E19B119D54BC84A753397D567A5F62950F0ACC
@@ -974,15 +989,15 @@ set PYTHONHOME=!python_dir!
 
 REM ImHex
 REM ----------------------------------------------------------------------------
-set imhex_sha256=080f537d3ea58c002cc2112adbec1352144710b43764de9a1dc04f129d3a3343
-set imhex_exe_sha256=6a4b0e70bf7c78af074af0de2346164d9f5aec28ea224f9ee903412e1c774d95
-set imhex_version=1.17.0
+set imhex_sha256=996FF7A1F26B40CED225A9D3CC7D9B695EA389895BC2BBBA7734C39FC5044E2A
+set imhex_exe_sha256=843166E3192D1443938B32CC4695E47B153FD94787875816A76C95D2F6F15A4B
+set imhex_version=1.25.0
 set imhex_name=imhex_win64
 
-set imhex_download_name=Windows.Portable.ZIP
+set imhex_download_name=imhex-!imhex_version!-Windows-Portable
 set imhex_download_file=!imhex_download_name!.zip
 set imhex_download_path=!downloads_dir!\!imhex_download_file!
-set imhex_download_url="https://github.com/WerWolv/ImHex/releases/download/v!imhex_version!/!imhex_download_url!"
+set imhex_download_url="https://github.com/WerWolv/ImHex/releases/download/v!imhex_version!/!imhex_download_file!"
 
 set imhex_dir=!tools_dir!\!imhex_name!_!imhex_version!
 set imhex_exe=!imhex_dir!\imhex.exe
@@ -1146,15 +1161,15 @@ call win_helpers.bat :MakeDirHardLink "!tools_dir!\!sioyek_name!" "!sioyek_dir!"
 
 REM fd
 REM ----------------------------------------------------------------------------
-set fd_sha256=F21BC26C1AB6BDBE4FE43F87A20C792D4ABE629AE97C6F42B25AC8A042F5521F
-set fd_exe_sha256=764F31AC5B477707B51DAEC32458E4D66059BA0D17F03032B7CD0C0534703354
-set fd_version=8.4.0
+set fd_sha256=2E9FE19B0C3B1EC67F9B834FA763B3A614EC9D0ADDAACBCA4614E862FB3EE4FB
+set fd_exe_sha256=b90ab51a05f933c22f3b87b3135cc5888dadb1527f7e18c83f7bb8978c4afeb6
+set fd_version=8.5.3
 set fd_name=fd_win64
 
-set fd_download_name=fd-!fd_version!-x86_64-pc-windows-msvc
+set fd_download_name=fd-v!fd_version!-x86_64-pc-windows-msvc
 set fd_download_file=!fd_download_name!.zip
 set fd_download_path=!downloads_dir!\!fd_download_file!
-set fd_download_url="https://github.com/sharkdp/fd/releases/download/!fd_version!/!fd_download_file!"
+set fd_download_url="https://github.com/sharkdp/fd/releases/download/v!fd_version!/!fd_download_file!"
 
 set fd_dir_name=!fd_name!_!fd_version!
 set fd_dir=!tools_dir!\!fd_dir_name!
@@ -1172,9 +1187,9 @@ call win_helpers.bat :MakeFileHardLink "!bin_dir!\fd.exe" "!fd_exe!" || exit /B
 
 REM wiztree
 REM ----------------------------------------------------------------------------
-set wiztree_sha256=066E270DE1E398CC8447428047628C241832D53839AAE9815443B486AFFD66C9
-set wiztree_exe_sha256=688a21f225af918c47b883a0d905922411a63cbe55785aa4fbc16af244c1fcdf
-set wiztree_version=4_08
+set wiztree_sha256=1625BAA8854B4F5BCEBEDE832AECFBBA079C0CAC623F1AACD56A7BF5011FFA51
+set wiztree_exe_sha256=3c33e9167b303dfca7ada6405b5ec0859b1bcc317dc4922664b59736b264cd26
+set wiztree_version=4_11
 set wiztree_name=wiztree_win64
 
 set wiztree_download_name=wiztree_!wiztree_version!_portable
@@ -1269,7 +1284,7 @@ set solidity_exe=!solidity_dir!\solidity_win64_!solidity_version!.exe
 
 if not exist "!solidity_exe!" (
     if not exist "!solidity_dir!" mkdir "!solidity_dir!"
-    call win_helpers.bat :DownloadFile "" "!solidity_exe!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :DownloadFile "!solidity_download_url!" "!solidity_exe!" || exit /B %ERRORLEVEL%
 )
 
 call win_helpers.bat :FileHashCheck sha256 "!solidity_exe!" "!solidity_exe_sha256!" || exit /B %ERRORLEVEL%
@@ -1279,9 +1294,11 @@ call win_helpers.bat :MakeFileHardLink "!bin_dir!\solc-!solidity_version!" "!sol
 
 REM Finish Terminal Script
 REM ----------------------------------------------------------------------------
+echo.>> "!tmp_terminal_script!"
 echo if exist "%%~dp0win_terminal_user_config.bat" call "%%~dp0win_terminal_user_config.bat">> "!tmp_terminal_script!"
-echo start "" /MAX "%%~dp0!wezterm_name!\wezterm-gui.exe">> "!tmp_terminal_script!"
-echo exit>> "!tmp_terminal_script!"
+echo start "" /MAX "%%~dp0!wezterm_name!\wezterm-gui.exe" ^^!working_dir^^!>> "!tmp_terminal_script!"
+echo.>> "!tmp_terminal_script!"
+
 move /Y !tmp_terminal_script! !terminal_script!
 
 REM Odin & Portable MSVC Work-around

From 51c6d505de90f49ced80f7159a1e55ff57cd20b6 Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Fri, 25 Nov 2022 20:18:09 +1100
Subject: [PATCH 33/41] nvim: Add tpope's abolish plugin

---
 Installer/os_nvim_init.vim | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Installer/os_nvim_init.vim b/Installer/os_nvim_init.vim
index a1fd7d0..ad65f05 100644
--- a/Installer/os_nvim_init.vim
+++ b/Installer/os_nvim_init.vim
@@ -6,6 +6,7 @@ call plug#begin(stdpath('config') . '/plugged')
     Plug 'https://github.com/scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
     Plug 'https://github.com/tpope/vim-dispatch'
     Plug 'https://github.com/tpope/vim-fugitive'
+    Plug 'https://github.com/tpope/vim-abolish'
 
     " TODO: 2022-06-19 Treesitter is too slow on large C++ files
     " Plug 'https://github.com/nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
@@ -110,8 +111,13 @@ lua <<EOF
         "  <ctrl+j>  jump to next compilation error",
         "  <ctrl+k>  jump to prev compilation error",
         "  <cd>      change working directory to current file",
-        "  <\\s>      split buffer vertically",
-        "  ",
+        "  <\\s>     split buffer vertically",
+        "",
+        "  Abolish Plugin (Text Substitution) (Normal Mode)",
+        "  --------------------------------------------------",
+        "  %Subvert/facilit{y,ies}/building{,s}/g Convert facility->building, facilities->buildings",
+        "  %Subvert/action/sleep/g                Convert action to sleep, (preserve case sensitivity ACTION->SLEEP, action->sleep) ",
+        "",
         "  Telescope Bindings (Normal Mode)",
         "  --------------------------------------------------",
         "  <\\te>     open telescope menu",
@@ -120,7 +126,7 @@ lua <<EOF
         "  <\\g>      search for text",
         "  <\\b>      search for buffer",
         "  <\\h>      search VIM help menu",
-        "  ",
+        "",
         "  LSP Bindings (Normal Mode)",
         "  --------------------------------------------------",
         "  <gD>      on (applicable) symbol, jump to declaration",

From 3936c81640ea7defe344eae790f0bca8a16e648b Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Mon, 28 Nov 2022 13:30:25 +1100
Subject: [PATCH 34/41] cmake: Use the hard-linked cmake folder in the PATH

---
 win_install.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/win_install.bat b/win_install.bat
index 0d8788c..7a03b52 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -235,7 +235,7 @@ for %%a in (%cmake_version_list%) do (
 )
 
 call win_helpers.bat :MakeDirHardLink "!tools_dir!/!cmake_name!" "!cmake_dir!" || exit /B %ERRORLEVEL%
-echo set PATH=%%~dp0!cmake_dir_name!\bin;%%PATH%%>> "!tmp_terminal_script!"
+echo set PATH=%%~dp0cmake_win64\bin;%%PATH%%>> "!tmp_terminal_script!"
 
 REM ctags
 REM ----------------------------------------------------------------------------

From 2477fc9e96000b2e77250f4611576321f99036d3 Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Mon, 5 Dec 2022 13:39:13 +1100
Subject: [PATCH 35/41] linux: Fix GCC build

---
 Installer/unix_gcc_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Installer/unix_gcc_build.sh b/Installer/unix_gcc_build.sh
index 9638b93..1021925 100755
--- a/Installer/unix_gcc_build.sh
+++ b/Installer/unix_gcc_build.sh
@@ -10,7 +10,7 @@ do
     docker create --name ${container_name} ${image_name} || exit
 
     mkdir --parent build || exit
-    docker cp ${container_name}:/usr/local/docker/mostlyportable-gcc/gcc-mostlyportable-${gcc_version} . || exit
+    docker cp ${container_name}:/usr/local/docker/mostlyportable-gcc/mostly-built/gcc-mostlyportable-${gcc_version} . || exit
 
     docker container rm ${container_name} || exit
 done

From b6b1f85c10d419fc0ec9c22e0e4a4bb1f2a3cbfa Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Mon, 5 Dec 2022 13:43:12 +1100
Subject: [PATCH 36/41] win: Add python scripts dir to path

---
 win_install.bat | 1 +
 1 file changed, 1 insertion(+)

diff --git a/win_install.bat b/win_install.bat
index 7a03b52..3783f1c 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -569,6 +569,7 @@ call win_helpers.bat :MakeDirHardLink "!tools_dir!\!python_name!" "!python_dir!"
 REM Terminal
 echo set PYTHONHOME=%%~dp0!python_name!>> "!tmp_terminal_script!"
 echo set PATH=%%~dp0!python_name!;%%PATH%%>> "!tmp_terminal_script!"
+echo set PATH=%%~dp0!python_name!\Scripts;%%PATH%%>> "!tmp_terminal_script!"
 
 REM RenderDoc
 REM ----------------------------------------------------------------------------

From 04f552eed6bcb7d325258b48fae415ee3b029567 Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Mon, 5 Dec 2022 16:50:14 +1100
Subject: [PATCH 37/41] Fix linux install

---
 linux_install.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux_install.sh b/linux_install.sh
index effb9e1..6f5be27 100755
--- a/linux_install.sh
+++ b/linux_install.sh
@@ -226,8 +226,8 @@ git checkout master
 
 # Use our custom G++ because I typically run Ubuntu 18.04 which uses G++7
 # which is too old to compile GF.
-PATH=${gcc_bin_dir}:${PATH} ./build.sh || exit
-ln --force --symbolic --relative "gf2" "${bin_dir}"
+#PATH=${gcc_bin_dir}:${PATH} ./build.sh || exit
+#ln --force --symbolic --relative "gf2" "${bin_dir}"
 
 cd "${root_dir}"
 
@@ -390,7 +390,7 @@ chmod +x ${bin_dir}/ctags_cpp.sh
 # Linux Terminal
 # ------------------------------------------------------------------------------
 echo \#!/usr/bin/env bash> ${tools_dir}/linux_terminal.sh
-echo PATH=${tools_dir}/Binaries>> ${tools_dir}/linux_terminal.sh
+echo PATH=${tools_dir}/Binaries:\$\{PATH\}>> ${tools_dir}/linux_terminal.sh
 echo PATH=\$\{PATH\}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin>> ${tools_dir}/linux_terminal.sh
 echo [[ -d /usr/lib/wsl/lib ]] \&\& PATH=\$\{PATH\}:/usr/lib/wsl/lib>> ${tools_dir}/linux_terminal.sh
 echo [[ -d /snap/bin ]] \&\& PATH=\$\{PATH\}:/snap/bin>> ${tools_dir}/linux_terminal.sh

From f6e3329278122d51c10971add657f8834afac8cf Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Thu, 8 Dec 2022 09:49:18 +1100
Subject: [PATCH 38/41] win: Remove home directory redirect

---
 win_install.bat | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/win_install.bat b/win_install.bat
index 3783f1c..f1f9a40 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -5,7 +5,7 @@ REM Setup
 REM ----------------------------------------------------------------------------
 set root_dir=%~dp0
 
-set home_dir=!root_dir!Home
+set home_dir=%home%
 set installer_dir=!root_dir!Installer
 set tools_dir=!root_dir!Tools
 set downloads_dir=!root_dir!Downloads
@@ -29,11 +29,6 @@ echo     set working_dir=^^!working_dir:\=/^^!>> "!tmp_terminal_script!"
 echo )>> "!tmp_terminal_script!"
 echo.>> "!tmp_terminal_script!"
 
-echo set HOME=%%~dp0..\Home>> "!tmp_terminal_script!"
-echo set HOMEPATH=%%~dp0..\Home>> "!tmp_terminal_script!"
-echo set USERPROFILE=%%~dp0..\Home>> "!tmp_terminal_script!"
-echo set APPDATA=%%~dp0..\Home\AppData>> "!tmp_terminal_script!"
-echo set LOCALAPPDATA=%%~dp0..\Home\AppData\Local>> "!tmp_terminal_script!"
 echo set PATH=%%~dp0Binaries;%%PATH%%>> "!tmp_terminal_script!"
 echo.>> "!tmp_terminal_script!"
 

From e0a3120a03a316e1eaaeff6abcf501653ac87b6e Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Tue, 20 Dec 2022 23:01:53 +1100
Subject: [PATCH 39/41] win: Update mobaxterm and process-hacker ->
 system-informer

---
 win_install.bat | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/win_install.bat b/win_install.bat
index f1f9a40..1d530e4 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -5,7 +5,7 @@ REM Setup
 REM ----------------------------------------------------------------------------
 set root_dir=%~dp0
 
-set home_dir=%home%
+set home_dir=%userprofile%
 set installer_dir=!root_dir!Installer
 set tools_dir=!root_dir!Tools
 set downloads_dir=!root_dir!Downloads
@@ -1045,18 +1045,18 @@ call win_helpers.bat :OverwriteCopy "!installer_dir!\os_clang_format_style_file"
 
 REM MobaXTerm
 REM ------------------------------------------------------------------------
-set mobaxterm_sha256=91f80537f12c2ad34a5eba99a285c149781c6d35a144a965ce3aea8a9bc6868c
-set mobaxterm_exe_sha256=1053c81b44018d6e6519a9c80d7413f7bb36e9f6e43b3da619b2229aa362a522
-set mobaxterm_version=21.2
+set mobaxterm_sha256=C8DE508D6731F31A73F061E58942691466D1D24CFA941E642E16E0930BE2FAD9
+set mobaxterm_exe_sha256=e47cb54645a368411c5d6b6cbfa7e25980a2a674d7d0c082f5137b6e77a2f362
+set mobaxterm_version=22.3
 set mobaxterm_name=mobaxterm_win64
 
 set mobaxterm_download_name=MobaXterm_Portable_v!mobaxterm_version!
 set mobaxterm_download_file=!mobaxterm_download_name!.zip
 set mobaxterm_download_path=!downloads_dir!\!mobaxterm_download_file!
-set mobaxterm_download_url="https://download.mobatek.net/2122021051924233/!mobaxterm_download_file!"
+set mobaxterm_download_url="https://download.mobatek.net/2232022120824733/!mobaxterm_download_file!"
 
 set mobaxterm_dir=!tools_dir!\!mobaxterm_name!_!mobaxterm_version!
-set mobaxterm_exe=!mobaxterm_dir!\MobaXterm_Personal_21.2.exe
+set mobaxterm_exe=!mobaxterm_dir!\MobaXterm_Personal_!mobaxterm_version!.exe
 
 if not exist "!mobaxterm_exe!" (
     call win_helpers.bat :DownloadFile "!mobaxterm_download_url!" !mobaxterm_download_path! || exit /B %ERRORLEVEL%
@@ -1079,29 +1079,29 @@ if not exist "!oo_shutup_10_file!" (
     call win_helpers.bat :DownloadFile "https://dl5.oo-software.com/files/ooshutup10/OOSU10.exe" "!oo_shutup_10_file!" || exit /B %ERRORLEVEL%
 )
 
-REM ProcessHacker
+REM SystemInformer
 REM ----------------------------------------------------------------------------
-set process_hacker_sha256=c662b756324c9727760b4e921459d31a30f99cf8d3f24b64f4fcb3b29a26beb4
-set process_hacker_exe_sha256=22b1b8f080a41a07f23eae8ab0ad2e5f88d3c5af5d8c1cd1bb4f6856482e945c
-set process_hacker_version=3.0.4861
-set process_hacker_name=process_hacker_win64
+set system_informer_sha256=48C869FF4CCEA0EA0D4E9A23E5BFBBA640B5F092BD69E779F320262BCCE0A491
+set system_informer_exe_sha256=77630EDBE08B29D1D0A709A3AFB54C1C7E198EAEE1013B8057EFEDC1D14F158D
+set system_informer_version=3.0.5553
+set system_informer_name=system_informer_win64
 
-set process_hacker_download_name=processhacker-!process_hacker_version!-bin
-set process_hacker_download_file=!process_hacker_download_name!.zip
-set process_hacker_download_path=!downloads_dir!\!process_hacker_download_file!
-set process_hacker_download_url="https://github.com/ProcessHackerRepoTool/nightly-builds-mirror/releases/download/v!process_hacker_version!/!process_hacker_download_file!"
+set system_informer_download_name=systeminformer-!system_informer_version!-bin
+set system_informer_download_file=!system_informer_download_name!.zip
+set system_informer_download_path=!downloads_dir!\!system_informer_download_file!
+set system_informer_download_url="https://github.com/winsiderss/si-builds/releases/download/!system_informer_version!/!system_informer_download_file!"
 
-set process_hacker_dir=!tools_dir!\!process_hacker_name!_!process_hacker_version!
-set process_hacker_exe=!process_hacker_dir!\64bit\ProcessHacker.exe
+set system_informer_dir=!tools_dir!\!system_informer_name!_!system_informer_version!
+set system_informer_exe=!system_informer_dir!\64bit\SystemInformer.exe
 
-if not exist "!process_hacker_exe!" (
-    call win_helpers.bat :DownloadFile "!process_hacker_download_url!" "!process_hacker_download_path!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :FileHashCheck sha256 "!process_hacker_download_path!" "!process_hacker_sha256!" || exit /B %ERRORLEVEL%
-    call win_helpers.bat :Unzip "!zip7_exe!" "!process_hacker_download_path!" "!process_hacker_dir!" || exit /B %ERRORLEVEL%
+if not exist "!system_informer_exe!" (
+    call win_helpers.bat :DownloadFile "!system_informer_download_url!" "!system_informer_download_path!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :FileHashCheck sha256 "!system_informer_download_path!" "!system_informer_sha256!" || exit /B %ERRORLEVEL%
+    call win_helpers.bat :Unzip "!zip7_exe!" "!system_informer_download_path!" "!system_informer_dir!" || exit /B %ERRORLEVEL%
 )
 
-call win_helpers.bat :FileHashCheck sha256 "!process_hacker_exe!" "!process_hacker_exe_sha256!" || exit /B %ERRORLEVEL%
-call win_helpers.bat :MakeDirHardLink "!tools_dir!\!process_hacker_name!" "!process_hacker_dir!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :FileHashCheck sha256 "!system_informer_exe!" "!system_informer_exe_sha256!" || exit /B %ERRORLEVEL%
+call win_helpers.bat :MakeDirHardLink "!tools_dir!\!system_informer_name!" "!system_informer_dir!" || exit /B %ERRORLEVEL%
 
 REM ripgrep
 REM ----------------------------------------------------------------------------

From afd77e38e9501adf977e65aa0a01ee274f30986f Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Thu, 5 Jan 2023 12:05:48 +1100
Subject: [PATCH 40/41] nvim: Remove telescope, use fzf directly

---
 Installer/os_nvim_init.vim | 334 ++++++++++++++-----------------------
 1 file changed, 122 insertions(+), 212 deletions(-)

diff --git a/Installer/os_nvim_init.vim b/Installer/os_nvim_init.vim
index ad65f05..71d835c 100644
--- a/Installer/os_nvim_init.vim
+++ b/Installer/os_nvim_init.vim
@@ -12,25 +12,9 @@ call plug#begin(stdpath('config') . '/plugged')
     " Plug 'https://github.com/nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
     Plug 'https://github.com/bfrg/vim-cpp-modern'
 
-    " Telescope file picker, sorter and previewer
-    Plug 'https://github.com/nvim-lua/plenary.nvim'
-    Plug 'https://github.com/nvim-telescope/telescope.nvim'
-    Plug 'nvim-telescope/telescope-fzf-native.nvim', { 'do': 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build' }
-
-    " nvim-lspconfig sets up sane defaults for LSP servers (i.e. clangd)
-    " nvim-cmp is a more powerful autocomplete engine
-    " LuaSnip allow writing snippets into the buffer, we can power the snippets from LSP
-    " cmp-nvim-lsp preset capability flags to request more powerful autocomplete from LSP server
-    " cmp_luasnip a LuaSnip addon that provides a completion source to nvim-cmp
-    " cmp-buffer provides a buffer completion source to nvim-cmp
-    " cmp-path provides a path completion source to nvim-cmp
-    Plug 'https://github.com/neovim/nvim-lspconfig'
-    Plug 'https://github.com/hrsh7th/nvim-cmp'
-    Plug 'https://github.com/L3MON4D3/LuaSnip'
-    Plug 'https://github.com/hrsh7th/cmp-nvim-lsp'
-    Plug 'https://github.com/saadparwaiz1/cmp_luasnip'
-    Plug 'https://github.com/hrsh7th/cmp-buffer'
-    Plug 'https://github.com/hrsh7th/cmp-path'
+    " FZF
+    Plug 'junegunn/fzf'
+    Plug 'junegunn/fzf.vim'
 
     " odin for syntax highlighting
     Plug 'https://github.com/Tetralux/odin.vim'
@@ -38,35 +22,65 @@ call plug#begin(stdpath('config') . '/plugged')
 
     " Lua cache to speed up load times
     Plug 'https://github.com/lewis6991/impatient.nvim'
+
+    " lsp-zero begin
+        " LSP Support
+        Plug 'neovim/nvim-lspconfig'
+        Plug 'williamboman/mason.nvim'
+        Plug 'williamboman/mason-lspconfig.nvim'
+
+        " Autocompletion
+        Plug 'hrsh7th/nvim-cmp'
+        Plug 'hrsh7th/cmp-buffer'
+        Plug 'hrsh7th/cmp-path'
+        Plug 'saadparwaiz1/cmp_luasnip'
+        Plug 'hrsh7th/cmp-nvim-lsp'
+        Plug 'hrsh7th/cmp-nvim-lua'
+
+        "  Snippets
+        Plug 'L3MON4D3/LuaSnip'
+
+        " Snippet collection (Optional)
+        Plug 'rafamadriz/friendly-snippets'
+        Plug 'VonHeikemen/lsp-zero.nvim'
+    " lsp-zero end
 call plug#end()
 
 " Lua Setup
 " ==============================================================================
 lua <<EOF
   require('impatient')
-  require('telescope').load_extension('fzf')
-  require('telescope').setup {
-    defaults = {
-      layout_config = {
-        horizontal = { width = 0.95 }
-      },
-      mappings = {
-        i = {
-          ["<C-j>"] = require('telescope.actions').move_selection_next,
-          ["<C-k>"] = require('telescope.actions').move_selection_previous,
-        },
-        n = {
-          ["<C-j>"] = require('telescope.actions').move_selection_next,
-          ["<C-k>"] = require('telescope.actions').move_selection_previous,
-        },
-      },
-    },
-    pickers = {
-      find_files = {
-        find_command = { "fd", "--unrestricted", "--strip-cwd-prefix" }
-      },
-    }
-  }
+
+  -- LSP Setup
+  -- ===========================================================================
+  local lsp = require('lsp-zero')
+  lsp.preset('recommended')
+  lsp.setup()
+
+  -- Treesitter
+  -- ===========================================================================
+  -- TODO: 2022-06-19 Treesitter is too slow on large C++ files
+  -- require('nvim-treesitter.configs').setup {
+  --   ensure_installed = { "c", "cpp" }, -- A list of parser names, or "all"
+  --   sync_install     = false,          -- Install parsers synchronously (only applied to `ensure_installed`)
+  --   ignore_install   = { },            -- List of parsers to ignore installing (for "all")
+
+  --   highlight = {
+  --     enable = false, -- `false` will disable the whole extension
+
+  --     -- NOTE: these are the names of the parsers and not the filetype. (for example if you want to
+  --     -- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is
+  --     -- the name of the parser)
+  --     -- list of language that will be disabled
+  --     disable = { },
+
+  --     -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
+  --     -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
+  --     -- Using this option may slow down your editor, and you may see some duplicate highlights.
+  --     -- Instead of true it can also be a list of languages
+  --     additional_vim_regex_highlighting = false,
+  --   },
+  -- }
 
   -- Vim Options
   -- ===========================================================================
@@ -92,6 +106,7 @@ lua <<EOF
   vim.opt.textwidth=80          -- On format, format to 80 char long lines
   vim.opt.visualbell=true       -- Flash the screen on error
   vim.opt.wrap=false            -- Don't wrap lines of text automatically
+  vim.opt.signcolumn = 'no'
 
   vim.diagnostic.config({
     -- Turn off the diagnostics signs on the line number. In LSP mode, editing
@@ -106,41 +121,59 @@ lua <<EOF
         "",
         "  Useful Bindings (Normal Mode)",
         "  --------------------------------------------------",
-        "  <ctrl+n>  to open the file tree explorer",
-        "  <ctrl+i>  clang format selected lines",
-        "  <ctrl+j>  jump to next compilation error",
-        "  <ctrl+k>  jump to prev compilation error",
-        "  <cd>      change working directory to current file",
-        "  <\\s>     split buffer vertically",
+        "  <Ctrl+n>    to open the file tree explorer",
+        "  <Ctrl+i>    clang format selected lines",
+        "  <Ctrl+j>    jump to next compilation error",
+        "  <Ctrl+k>    jump to prev compilation error",
+        "  <cd>        change working directory to current file",
+        "  <\\s>       split buffer vertically",
         "",
-        "  Abolish Plugin (Text Substitution) (Normal Mode)",
+        "  Abolish (Text Substitution in Normal Mode)",
         "  --------------------------------------------------",
-        "  %Subvert/facilit{y,ies}/building{,s}/g Convert facility->building, facilities->buildings",
-        "  %Subvert/action/sleep/g                Convert action to sleep, (preserve case sensitivity ACTION->SLEEP, action->sleep) ",
+        "  %S/facilit{y,ies}/building{,s}/g Convert facility->building, facilities->buildings",
+        "  %S/action/sleep/g                Convert action to sleep, (preserve case sensitivity ACTION->SLEEP, action->sleep) ",
         "",
-        "  Telescope Bindings (Normal Mode)",
+        "  FZF (Normal Mode)",
         "  --------------------------------------------------",
-        "  <\\te>     open telescope menu",
-        "  <\\ta>     search for symbol via tags",
-        "  <\\f>      search for file",
-        "  <\\g>      search for text",
-        "  <\\b>      search for buffer",
-        "  <\\h>      search VIM help menu",
+        "  <\\h>       vim command history",
+        "  <\\f>       find files",
+        "  <\\g>       search for text (via ripgrep)",
+        "  <\\tt>      search for tag (global)",
+        "  <\\tb>      search for tag (buffer)",
+        "  <\\cc>      search for commit (global)",
+        "  <\\cb>      search for commit (buffer)",
+        "  <\\b>       search for buffer",
+        "",
+        "  Autocompletion (nvim-cmp in Normal Mode)",
+        "  --------------------------------------------------",
+        "  <Enter>     Confirms selection.",
+        "  <Ctrl-y>    Confirms selection.",
+        "  <Up>        Navigate to previous item on the list.",
+        "  <Down>      Navigate to the next item on the list.",
+        "  <Ctrl-p>    Navigate to previous item on the list.",
+        "  <Ctrl-n>    Navigate to the next item on the list.",
+        "  <Ctrl-u>    Scroll up in the item's documentation.",
+        "  <Ctrl-f>    Scroll down in the item's documentation.",
+        "  <Ctrl-e>    Toggles the completion.",
+        "  <Ctrl-d>    Go to the next placeholder in the snippet.",
+        "  <Ctrl-b>    Go to the previous placeholder in the snippet.",
+        "  <Tab>       Enables completion when the cursor is inside a word. If the completion menu is visible it will navigate to the next item in the list.",
+        "  <Shift-Tab> When the completion menu is visible navigate to the previous item in the list.",
         "",
         "  LSP Bindings (Normal Mode)",
         "  --------------------------------------------------",
-        "  <gD>      on (applicable) symbol, jump to declaration",
-        "  <gd>      on (applicable) symbol, jump to definition",
-        "  <gt>      on (applicable) symbol, jump to type definition",
-        "  <gr>      on (applicable) symbol, show caller references",
-        "  <gf>      on (applicable) symbol, search available symbols",
-        "  <ga>      on (applicable) symbol, show code-actions prompt",
-        "  <gR>      on (applicable) symbol, code-aware symbol rename",
-        "  <gs>      on (applicable) symbol, show signature help",
-        "  <shift+k> on (applicable) symbol, show documentation",
-        "  <space+e> on red underlined symbol error, show error message",
-        "  <alt+n>   jump to next LSP error",
-        "  <alt+n>   jump to prev LSP error",
+        "  <Shift-K>   Displays hover information about the symbol under the cursor in a floating window. See help vim.lsp.buf.hover().",
+        "  gd          Jumps to the definition of the symbol under the cursor. See help vim.lsp.buf.definition().",
+        "  gD          Jumps to the declaration of the symbol under the cursor. Some servers don't implement this feature. See help vim.lsp.buf.declaration().",
+        "  gi          Lists all the implementations for the symbol under the cursor in the quickfix window. See help vim.lsp.buf.implementation().",
+        "  go          Jumps to the definition of the type of the symbol under the cursor. See help vim.lsp.buf.type_definition().",
+        "  gr          Lists all the references to the symbol under the cursor in the quickfix window. See help vim.lsp.buf.references().",
+        "  <Ctrl-k>    Displays signature information about the symbol under the cursor in a floating window. See help vim.lsp.buf.signature_help(). If a mapping already exists for this key this function is not bound.",
+        "  <F2>        Renames all references to the symbol under the cursor. See help vim.lsp.buf.rename().",
+        "  <F4>        Selects a code action available at the current cursor position. See help vim.lsp.buf.code_action().",
+        "  gl          Show diagnostics in a floating window. See :help vim.diagnostic.open_float().",
+        "  [d          Move to the previous diagnostic in the current buffer. See :help vim.diagnostic.goto_prev().",
+        "  ]d          Move to the next diagnostic. See :help vim.diagnostic.goto_next()."
     }
 
     local height = vim.api.nvim_get_option("lines")
@@ -159,140 +192,20 @@ lua <<EOF
         vim.api.nvim_buf_set_option(buf, "buflisted", true)
     end
 
-    -- Only display if there is enough space
-    if height >= ascii_rows and width >= ascii_cols then
-      vim.api.nvim_buf_set_lines(buf, 0, -1, false, ascii)
-      vim.api.nvim_buf_set_option(buf, "modified", false)
-      vim.api.nvim_buf_set_option(buf, "buflisted", false)
-      vim.api.nvim_buf_set_option(buf, "bufhidden", "wipe")
-      vim.api.nvim_buf_set_option(buf, "buftype", "nofile")
-      vim.api.nvim_buf_set_option(buf, "swapfile", false)
-      vim.api.nvim_set_current_buf(buf)
+    vim.api.nvim_buf_set_lines(buf, 0, -1, false, ascii)
+    vim.api.nvim_buf_set_option(buf, "modified", false)
+    vim.api.nvim_buf_set_option(buf, "buflisted", false)
+    vim.api.nvim_buf_set_option(buf, "bufhidden", "wipe")
+    vim.api.nvim_buf_set_option(buf, "buftype", "nofile")
+    vim.api.nvim_buf_set_option(buf, "swapfile", false)
+    vim.api.nvim_set_current_buf(buf)
 
-      vim.api.nvim_create_autocmd("InsertEnter,WinEnter", {
-          pattern = "<buffer>",
-          callback = reset_start_screen,
-      })
-    end
+    vim.api.nvim_create_autocmd("InsertEnter,WinEnter", {
+        pattern = "<buffer>",
+        callback = reset_start_screen,
+    })
   end
 
-  -- LSP Setup
-  -- ===========================================================================
-  -- Load the additional capabilities supported by nvim-cmp
-  local custom_capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
-
-  -- Use an on_attach function to only map the following keys
-  -- after the language server attaches to the current buffer
-  local custom_on_attach = function(client, bufnr)
-    -- Enable completion triggered by <c-x><c-o>
-    vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
-
-    -- See `:help vim.diagnostic.*` for documentation on any of the below functions
-    local opts = { noremap=true, silent=true }
-    vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, opts)
-    vim.keymap.set('n', '<A-n>',    vim.diagnostic.goto_next,  opts)
-    vim.keymap.set('n', '<A-p>',    vim.diagnostic.goto_prev,  opts)
-
-    -- See `:help vim.lsp.*` for documentation on any of the below functions
-    local bufopts = { noremap=true, silent=true, buffer=bufnr }
-    vim.keymap.set('n',  'K', vim.lsp.buf.hover,           bufopts)
-    vim.keymap.set('n', 'gD', vim.lsp.buf.declaration,     bufopts)
-    vim.keymap.set('n', 'gs', vim.lsp.buf.signature_help,  bufopts)
-    vim.keymap.set('n', 'ga', vim.lsp.buf.code_action,     bufopts)
-    vim.keymap.set('n', 'gR', vim.lsp.buf.rename,          bufopts)
-  end
-
-  -- Request additional completion capabilities from the LSP server(s)
-  local lspconfig = require('lspconfig')
-
-  -- Clangd LSP Setup
-  -- ===========================================================================
-  lspconfig.clangd.setup {
-    on_attach           = custom_on_attach,
-    capabilities        = custom_capabilities,
-    single_file_support = false, --- Don't launch LSP if the directory does not have LSP metadata
-  }
-
-  lspconfig.cmake.setup {
-    on_attach    = custom_on_attach,
-    capabilities = custom_capabilities,
-  }
-
-  -- Autocomplete Setup
-  -- ===========================================================================
-  local luasnip = require 'luasnip'
-  local cmp     = require 'cmp'
-
-  local has_words_before = function()
-    local line, col = unpack(vim.api.nvim_win_get_cursor(0))
-    return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
-  end
-
-  cmp.setup {
-    snippet = {
-      expand = function(args) luasnip.lsp_expand(args.body) end,
-    },
-    window = {
-        completion = cmp.config.window.bordered(),
-        documentation = cmp.config.window.bordered(),
-    },
-    completion = { autocomplete = false },
-    mapping = cmp.mapping.preset.insert({
-      ['<C-d>'] = cmp.mapping.scroll_docs(4),
-      ['<C-u>'] = cmp.mapping.scroll_docs(-4),
-      ['<C-k>'] = cmp.mapping.scroll_docs(-1),   -- Scroll the docs up   by 1 line
-      ['<C-j>'] = cmp.mapping.scroll_docs(1),    -- Scroll the docs down by 1 line
-      ['<CR>']  = cmp.mapping.confirm { behavior = cmp.ConfirmBehavior.Replace, select = true, },
-      ['<Tab>'] = cmp.mapping(function(fallback) -- Move down the autocomplete list
-        if cmp.visible() then
-          cmp.select_next_item()
-        elseif luasnip.expand_or_jumpable() then
-          luasnip.expand_or_jump()
-        elseif has_words_before() then
-          cmp.complete()
-        else
-          fallback()
-        end
-      end, { 'i', 's' }),
-      ['<S-Tab>'] = cmp.mapping(function(fallback) -- Move up the autocomplete list
-        if cmp.visible() then
-          cmp.select_prev_item()
-        elseif luasnip.jumpable(-1) then
-          luasnip.jump(-1)
-        else
-          fallback()
-        end
-      end, { 'i', 's' }),
-    }),
-    sources = {
-      { name = 'nvim_lsp' },
-      { name = 'luasnip' },
-      { name = 'buffer' },
-    },
-  }
-
-  -- TODO: 2022-06-19 Treesitter is too slow on large C++ files
-  -- require('nvim-treesitter.configs').setup {
-  --   ensure_installed = { "c", "cpp" }, -- A list of parser names, or "all"
-  --   sync_install     = false,          -- Install parsers synchronously (only applied to `ensure_installed`)
-  --   ignore_install   = { },            -- List of parsers to ignore installing (for "all")
-
-  --   highlight = {
-  --     enable = false, -- `false` will disable the whole extension
-
-  --     -- NOTE: these are the names of the parsers and not the filetype. (for example if you want to
-  --     -- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is
-  --     -- the name of the parser)
-  --     -- list of language that will be disabled
-  --     disable = { },
-
-  --     -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-  --     -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-  --     -- Using this option may slow down your editor, and you may see some duplicate highlights.
-  --     -- Instead of true it can also be a list of languages
-  --     additional_vim_regex_highlighting = false,
-  --   },
-  -- }
 EOF
 
 " Theme
@@ -368,17 +281,14 @@ augroup end
 " General Key Bindings
 " ==============================================================================
 " Telescope Bindings
-nnoremap <leader>f  <cmd>Telescope find_files<cr>
-nnoremap <leader>g  <cmd>Telescope live_grep<cr>
-nnoremap <leader>ta <cmd>Telescope tags<cr>
-nnoremap <leader>te <cmd>Telescope<cr>
-nnoremap <leader>b  <cmd>Telescope buffers<cr>
-nnoremap <leader>h  <cmd>Telescope help_tags<cr>
-
-nnoremap gf <cmd>Telescope lsp_dynamic_workspace_symbols<cr>
-nnoremap gd <cmd>Telescope lsp_definitions<cr>
-nnoremap gt <cmd>Telescope lsp_type_definitions<cr>
-nnoremap gr <cmd>Telescope lsp_references<cr>
+nnoremap <leader>h   <cmd>FzfHistory<cr>
+nnoremap <leader>f   <cmd>FzfFiles<cr>
+nnoremap <leader>g   <cmd>FzfRg<cr>
+nnoremap <leader>tt  <cmd>FzfTags<cr>
+nnoremap <leader>tb  <cmd>FzfBTags<cr>
+nnoremap <leader>cc  <cmd>FzfCommits<cr>
+nnoremap <leader>cb  <cmd>FzfBCommits<cr>
+nnoremap <leader>b  <cmd>FzfBuffers<cr>
 
 " Map Ctrl+HJKL to navigate buffer window
 nmap <silent> <C-h> :wincmd h<CR>

From c4deece666f4690afb351eb64da3e86a86456f28 Mon Sep 17 00:00:00 2001
From: doyle <doylet@protonmail.com>
Date: Fri, 6 Jan 2023 12:38:44 +1100
Subject: [PATCH 41/41] nvim: Augment FZF/FD more

---
 Installer/os_nvim_init.vim | 73 ++++++++++++++++++++++++--------------
 win_install.bat            |  2 +-
 2 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/Installer/os_nvim_init.vim b/Installer/os_nvim_init.vim
index 71d835c..dab42f2 100644
--- a/Installer/os_nvim_init.vim
+++ b/Installer/os_nvim_init.vim
@@ -16,6 +16,10 @@ call plug#begin(stdpath('config') . '/plugged')
     Plug 'junegunn/fzf'
     Plug 'junegunn/fzf.vim'
 
+    " FZF for LSP
+    Plug 'gfanto/fzf-lsp.nvim'
+    Plug 'nvim-lua/plenary.nvim'
+
     " odin for syntax highlighting
     Plug 'https://github.com/Tetralux/odin.vim'
     Plug 'https://github.com/sainnhe/gruvbox-material'
@@ -126,7 +130,7 @@ lua <<EOF
         "  <Ctrl+j>    jump to next compilation error",
         "  <Ctrl+k>    jump to prev compilation error",
         "  <cd>        change working directory to current file",
-        "  <\\s>       split buffer vertically",
+        "  <\\s>        split buffer vertically",
         "",
         "  Abolish (Text Substitution in Normal Mode)",
         "  --------------------------------------------------",
@@ -135,14 +139,14 @@ lua <<EOF
         "",
         "  FZF (Normal Mode)",
         "  --------------------------------------------------",
-        "  <\\h>       vim command history",
-        "  <\\f>       find files",
-        "  <\\g>       search for text (via ripgrep)",
-        "  <\\tt>      search for tag (global)",
-        "  <\\tb>      search for tag (buffer)",
-        "  <\\cc>      search for commit (global)",
-        "  <\\cb>      search for commit (buffer)",
-        "  <\\b>       search for buffer",
+        "  <\\h>        vim command history",
+        "  <\\f>        find files",
+        "  <\\g>        search for text (via ripgrep)",
+        "  <\\tt>       search for tag (global)",
+        "  <\\tb>       search for tag (buffer)",
+        "  <\\cc>       search for commit (global)",
+        "  <\\cb>       search for commit (buffer)",
+        "  <\\b>        search for buffer",
         "",
         "  Autocompletion (nvim-cmp in Normal Mode)",
         "  --------------------------------------------------",
@@ -278,16 +282,42 @@ augroup persistent_settings
   au bufenter * :set formatoptions=q1j
 augroup end
 
+" FZF
+" ==============================================================================
+" Empty value to disable preview window altogether
+let g:fzf_preview_window = []
+
+" Prefix all commands with Fzf for discoverability
+let g:fzf_command_prefix = 'Fzf'
+
+" - down / up / left / right
+let g:fzf_layout = { 'down': '40%' }
+
+" Add "FzfCustomRG" command which reinitializes
+function! RipgrepFzf(query, fullscreen)
+  let command_fmt = 'rg --column --line-number --no-heading --color=always --smart-case -- %s || true'
+  let initial_command = printf(command_fmt, shellescape(a:query))
+  let reload_command = printf(command_fmt, '{q}')
+  let spec = {'options': ['--phony', '--query', a:query, '--bind', 'change:reload:'.reload_command]}
+  call fzf#vim#grep(initial_command, 1, fzf#vim#with_preview(spec), a:fullscreen)
+endfunction
+
+command! -nargs=* -bang FzfCustomRG call RipgrepFzf(<q-args>, <bang>0)
+
+" Augment the "FzfCustomFiles" command
+command! -bang -nargs=? -complete=dir FzfCustomFiles
+    \ call fzf#vim#files(<q-args>, {'options': ['--layout=reverse', '--info=inline', '--preview', 'cat {}']}, <bang>0)
+
 " General Key Bindings
 " ==============================================================================
 " Telescope Bindings
-nnoremap <leader>h   <cmd>FzfHistory<cr>
-nnoremap <leader>f   <cmd>FzfFiles<cr>
-nnoremap <leader>g   <cmd>FzfRg<cr>
-nnoremap <leader>tt  <cmd>FzfTags<cr>
-nnoremap <leader>tb  <cmd>FzfBTags<cr>
-nnoremap <leader>cc  <cmd>FzfCommits<cr>
-nnoremap <leader>cb  <cmd>FzfBCommits<cr>
+nnoremap <leader>h  <cmd>FzfHistory<cr>
+nnoremap <leader>f  <cmd>FzfCustomFiles<cr>
+nnoremap <leader>g  <cmd>FzfCustomRG<cr>
+nnoremap <leader>tt <cmd>FzfTags<cr>
+nnoremap <leader>tb <cmd>FzfBTags<cr>
+nnoremap <leader>cc <cmd>FzfCommits<cr>
+nnoremap <leader>cb <cmd>FzfBCommits<cr>
 nnoremap <leader>b  <cmd>FzfBuffers<cr>
 
 " Map Ctrl+HJKL to navigate buffer window
@@ -316,17 +346,6 @@ nnoremap <leader>s :vs<CR>
 nnoremap <A-j> :cn<CR>
 nnoremap <A-k> :cp<CR>
 
-" FZF
-" ==============================================================================
-" Empty value to disable preview window altogether
-let g:fzf_preview_window = []
-
-" Prefix all commands with Fzf for discoverability
-let g:fzf_command_prefix = 'Fzf'
-
-" - down / up / left / right
-let g:fzf_layout = { 'down': '40%' }
-
 " Clang Format
 " ==============================================================================
 map <C-I> :py3file ~/clang-format.py<CR>
diff --git a/win_install.bat b/win_install.bat
index 1d530e4..ec1f66f 100644
--- a/win_install.bat
+++ b/win_install.bat
@@ -855,7 +855,7 @@ call win_helpers.bat :MakeFileHardLink "!bin_dir!\fzf.exe" "!fzf_exe!" || exit /
 REM Terminal
 REM Use FD for FZF to make it ultra fast
 echo set FZF_DEFAULT_OPTS=--multi --layout=reverse>> "!tmp_terminal_script!"
-echo set FZF_DEFAULT_COMMAND=fd --unrestricted>> "!tmp_terminal_script!"
+echo set FZF_DEFAULT_COMMAND=fd --type f --strip-cwd-prefix --hidden --follow --exclude .git --exclude .cache --exclude .vs>> "!tmp_terminal_script!"
 
 REM jpegview
 REM ----------------------------------------------------------------------------