From 5534aa6946919a2805f61faf52a154775a646e87 Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <v-aleche@microsoft.com>
Date: Fri, 13 Nov 2020 10:25:05 +0300
Subject: [PATCH] remove ruby doc folder

---
 images/win/scripts/Installers/Install-Ruby.ps1 |  5 ++++-
 images/win/windows2019.json                    | 10 +---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/images/win/scripts/Installers/Install-Ruby.ps1 b/images/win/scripts/Installers/Install-Ruby.ps1
index e2b1763f..2fc3bfde 100644
--- a/images/win/scripts/Installers/Install-Ruby.ps1
+++ b/images/win/scripts/Installers/Install-Ruby.ps1
@@ -60,7 +60,7 @@ function Install-Ruby
 
         if (-not (Test-Path $rubyToolcachePath))
         {
-            Write-Host "Create Ruby toolcache folder"
+            Write-Host "Creating Ruby toolcache folder"
             New-Item -ItemType Directory -Path $rubyToolcachePath | Out-Null
         }
 
@@ -70,6 +70,9 @@ function Install-Ruby
         Write-Host "Moving Ruby '${rubyVersion}' files to '${rubyArchPath}'"
         Move-Item -Path $tempFolder -Destination $rubyArchPath | Out-Null
 
+        Write-Host "Removing Ruby '${rubyVersion}' documentation '${rubyArchPath}\share\doc' folder"
+        Remove-Item -Path "${rubyArchPath}\share\doc" -Force -Recurse -ErrorAction Ignore
+
         Write-Host "Installing Bundler"
         cmd.exe /c "$rubyArchPath\bin\gem.cmd install bundler -v ""~> 2"" --no-document"
 
diff --git a/images/win/windows2019.json b/images/win/windows2019.json
index 756391ed..71a8c98f 100644
--- a/images/win/windows2019.json
+++ b/images/win/windows2019.json
@@ -215,15 +215,6 @@
             "type": "windows-restart",
             "restart_timeout": "10m"
         },
-        {
-            "type": "powershell",
-            "environment_vars": [
-                "ROOT_FOLDER={{user `root_folder`}}"
-            ],
-            "scripts": [
-                "{{ template_dir }}/scripts/Installers/Install-Ruby.ps1"
-            ]
-        },
         {
             "type": "windows-shell",
             "inline": [
@@ -238,6 +229,7 @@
                 "PSMODULES_ROOT_FOLDER={{user `psmodules_root_folder`}}"
             ],
             "scripts": [
+                "{{ template_dir }}/scripts/Installers/Install-Ruby.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-PyPy.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Toolset.ps1",
                 "{{ template_dir }}/scripts/Installers/Configure-Toolset.ps1",