From b5388fcab10b367a1f5758f4dc8b6bc4e5829427 Mon Sep 17 00:00:00 2001 From: "Lea N. - LeaDevelop" <104503492+LeaDevelop@users.noreply.github.com> Date: Mon, 28 Oct 2024 21:15:45 +0100 Subject: [PATCH 1/5] (#1028) Improved flow for cases when chocolatey is not installed --- .../en-us/guides/organizations/set-up-chocolatey-server.mdx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/content/docs/en-us/guides/organizations/set-up-chocolatey-server.mdx b/src/content/docs/en-us/guides/organizations/set-up-chocolatey-server.mdx index 76b2da5928d..1bd5fdb6542 100644 --- a/src/content/docs/en-us/guides/organizations/set-up-chocolatey-server.mdx +++ b/src/content/docs/en-us/guides/organizations/set-up-chocolatey-server.mdx @@ -138,8 +138,7 @@ function New-AclObject { } if ($null -eq (Get-Command -Name 'choco.exe' -ErrorAction SilentlyContinue)) { - Write-Warning "Chocolatey not installed. Cannot install standard packages." - Exit 1 + Write-Error "Chocolatey not installed. Cannot install standard packages." -ErrorAction Stop } # Install Chocolatey.Server prereqs choco install IIS-WebServer --source windowsfeatures From d7ad737d958fbafaeb472243c5e206259bc2d10e Mon Sep 17 00:00:00 2001 From: "Lea N. - LeaDevelop" <104503492+LeaDevelop@users.noreply.github.com> Date: Mon, 28 Oct 2024 21:52:49 +0100 Subject: [PATCH 2/5] (#1028) Improved automate-package-internalization.mdx's script for cases when chocolatey is not installed --- .../guides/organizations/automate-package-internalization.mdx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/content/docs/en-us/guides/organizations/automate-package-internalization.mdx b/src/content/docs/en-us/guides/organizations/automate-package-internalization.mdx index 6579c77e7e5..3c1fe02f8ea 100644 --- a/src/content/docs/en-us/guides/organizations/automate-package-internalization.mdx +++ b/src/content/docs/en-us/guides/organizations/automate-package-internalization.mdx @@ -102,8 +102,7 @@ Before starting, make sure you install Chocolatey Server on separate servers. } if ($null -eq (Get-Command -Name 'choco.exe' -ErrorAction SilentlyContinue)) { - Write-Warning "Chocolatey not installed. Cannot install standard packages." - Exit 1 + Write-Error "Chocolatey not installed. Cannot install standard packages." -ErrorAction Stop } # Install Chocolatey.Server prereqs From 8fc2d5708f98b693c362557db26d2be1e9fdaede Mon Sep 17 00:00:00 2001 From: "Lea N. - LeaDevelop" <104503492+LeaDevelop@users.noreply.github.com> Date: Mon, 28 Oct 2024 21:52:49 +0100 Subject: [PATCH 3/5] (#1039) Improved automate-package-internalization.mdx's script for cases when chocolatey is not installed --- .../guides/organizations/automate-package-internalization.mdx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/content/docs/en-us/guides/organizations/automate-package-internalization.mdx b/src/content/docs/en-us/guides/organizations/automate-package-internalization.mdx index 6579c77e7e5..3c1fe02f8ea 100644 --- a/src/content/docs/en-us/guides/organizations/automate-package-internalization.mdx +++ b/src/content/docs/en-us/guides/organizations/automate-package-internalization.mdx @@ -102,8 +102,7 @@ Before starting, make sure you install Chocolatey Server on separate servers. } if ($null -eq (Get-Command -Name 'choco.exe' -ErrorAction SilentlyContinue)) { - Write-Warning "Chocolatey not installed. Cannot install standard packages." - Exit 1 + Write-Error "Chocolatey not installed. Cannot install standard packages." -ErrorAction Stop } # Install Chocolatey.Server prereqs From 476251cbe0a4efb41404c596c8f9a821afea5fa3 Mon Sep 17 00:00:00 2001 From: "Lea N. - LeaDevelop" <104503492+LeaDevelop@users.noreply.github.com> Date: Mon, 28 Oct 2024 21:15:45 +0100 Subject: [PATCH 4/5] (#1039) Improved flow for cases when chocolatey is not installed --- .../en-us/guides/organizations/set-up-chocolatey-server.mdx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/content/docs/en-us/guides/organizations/set-up-chocolatey-server.mdx b/src/content/docs/en-us/guides/organizations/set-up-chocolatey-server.mdx index 76b2da5928d..1bd5fdb6542 100644 --- a/src/content/docs/en-us/guides/organizations/set-up-chocolatey-server.mdx +++ b/src/content/docs/en-us/guides/organizations/set-up-chocolatey-server.mdx @@ -138,8 +138,7 @@ function New-AclObject { } if ($null -eq (Get-Command -Name 'choco.exe' -ErrorAction SilentlyContinue)) { - Write-Warning "Chocolatey not installed. Cannot install standard packages." - Exit 1 + Write-Error "Chocolatey not installed. Cannot install standard packages." -ErrorAction Stop } # Install Chocolatey.Server prereqs choco install IIS-WebServer --source windowsfeatures From e9f84209c6c7d375c3f9bfb3aae88ac545a869fe Mon Sep 17 00:00:00 2001 From: "Lea N. - LeaDevelop" <104503492+LeaDevelop@users.noreply.github.com> Date: Mon, 28 Oct 2024 21:52:49 +0100 Subject: [PATCH 5/5] (#1039) Improved automate-package-internalization.mdx's script for cases when chocolatey is not installed --- .../guides/organizations/automate-package-internalization.mdx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/content/docs/en-us/guides/organizations/automate-package-internalization.mdx b/src/content/docs/en-us/guides/organizations/automate-package-internalization.mdx index 6579c77e7e5..3c1fe02f8ea 100644 --- a/src/content/docs/en-us/guides/organizations/automate-package-internalization.mdx +++ b/src/content/docs/en-us/guides/organizations/automate-package-internalization.mdx @@ -102,8 +102,7 @@ Before starting, make sure you install Chocolatey Server on separate servers. } if ($null -eq (Get-Command -Name 'choco.exe' -ErrorAction SilentlyContinue)) { - Write-Warning "Chocolatey not installed. Cannot install standard packages." - Exit 1 + Write-Error "Chocolatey not installed. Cannot install standard packages." -ErrorAction Stop } # Install Chocolatey.Server prereqs