feat: copy common GNU tools included with git for Windows in the $bas…

…eDir tool folder (#229) * feat: use common GNU tools included with git for Windows Ref: jenkins-infra/helpdesk#2873 * Apply suggestions from code review
jenkins-infra · May 13, 2022 · 8db4e46 · 8db4e46
1 parent d9afbf6
commit 8db4e46
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/scripts/windows-2019-provision.ps1 b/scripts/windows-2019-provision.ps1
@@ -132,18 +132,30 @@ $downloads = [ordered]@{
             & "mvn.cmd" -v;
         }
     };
-    'git' = @{
+    'git-and-gnu-tools' = @{
         'url' = 'https://github.com/git-for-windows/git/releases/download/v{0}.windows.1/MinGit-{0}-64-bit.zip' -f $env:GIT_WINDOWS_VERSION;
         'local' = "$baseDir\MinGit.zip";
         'expandTo' = "$baseDir\git";
         'postexpand' = {
             & "$baseDir\git\cmd\git.exe" config --system core.autocrlf false;
             & "$baseDir\git\cmd\git.exe" config --system core.longpaths true;
+            # Cherry-pick common GNU tools compiled for Windows included with Git for Windows
+
+            # We don't want all of them as it can interfere with native Windows cli tools
+            & Copy-Item -Path "$baseDir\git\usr\bin\awk.exe" -Destination "$baseDir\awk.exe";
+            & Copy-Item -Path "$baseDir\git\usr\bin\grep.exe" -Destination "$baseDir\grep.exe";
+            & Copy-Item -Path "$baseDir\git\usr\bin\rm.exe" -Destination "$baseDir\rm.exe";
+            & Copy-Item -Path "$baseDir\git\usr\bin\sort.exe" -Destination "$baseDir\sort.exe";
         };
         'path' = "$baseDir\git\cmd";
         'cleanuplocal' = 'true';
         'sanityCheck'= {
             & "git.exe" --version;
+            # GNU tools
+            & "awk.exe" --version;
+            & "grep.exe" --version;
+            & "rm.exe" --version;
+            & "sort.exe" --version;
         }
     };
     'gitlfs' = @{
@@ -230,7 +242,8 @@ $downloads = [ordered]@{
         'postexpand' = {
             # Installation of Chocolatey
             & "$baseDir\chocolatey.tmp\tools\chocolateyInstall.ps1";
-            # Installation of make for Windows with Chocolatey
+            # Installation of make for Windows with Chocolatey (not included with Git for Windows)
+
             & "C:\ProgramData\chocolatey\bin\choco.exe" install make --version "$env:CHOCOLATEY_MAKE_VERSION";
             & Remove-Item -Force -Recurse "$baseDir\chocolatey.tmp";
         };