From f14249012fd970d3fd73604e6fff9b6c7990a9bb Mon Sep 17 00:00:00 2001 From: Paulin Todev Date: Thu, 26 Sep 2024 15:27:02 +0100 Subject: [PATCH] [release/v1.4] Fix Windows installer (#1767) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(installer): do not quote servicepath in registy (#1765) * Update VERSION --------- Co-authored-by: Jan-Otto Kröpke --- CHANGELOG.md | 7 +++++++ VERSION | 2 +- docs/sources/_index.md | 2 +- packaging/windows/install_script.nsis | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6341b3ac5e..ff0c277f15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ This document contains a historical list of changes between releases. Only changes that impact end-user behavior are listed; changes to documentation or internal API changes are not present. +v1.4.1 +----------------- + +### Bugfixes + +- Windows installer: Don't quote Alloy's binary path in the Windows Registry. (@jkroepke) + v1.4.0 ----------------- diff --git a/VERSION b/VERSION index cfa1ed287f..92d0fee589 100644 --- a/VERSION +++ b/VERSION @@ -20,4 +20,4 @@ # # Lines starting with "#" and blank lines are ignored. -v1.4.0 +v1.4.1 diff --git a/docs/sources/_index.md b/docs/sources/_index.md index 3421599fee..f7ce81a068 100644 --- a/docs/sources/_index.md +++ b/docs/sources/_index.md @@ -4,7 +4,7 @@ title: Grafana Alloy description: Grafana Alloy is a a vendor-neutral distribution of the OTel Collector weight: 350 cascade: - ALLOY_RELEASE: v1.4.0 + ALLOY_RELEASE: v1.4.1 OTEL_VERSION: v0.105.0 FULL_PRODUCT_NAME: Grafana Alloy PRODUCT_NAME: Alloy diff --git a/packaging/windows/install_script.nsis b/packaging/windows/install_script.nsis index 3f3a114d09..8c3ad4c4e7 100644 --- a/packaging/windows/install_script.nsis +++ b/packaging/windows/install_script.nsis @@ -156,7 +156,7 @@ Function InitializeRegistry nsExec::ExecToLog 'Reg.exe query "${REGKEY}" /reg:64 /ve' Pop $0 ${If} $0 == 1 - nsExec::ExecToLog 'Reg.exe add "${REGKEY}" /reg:64 /ve /d "\"$INSTDIR\alloy-windows-amd64.exe\""' + nsExec::ExecToLog 'Reg.exe add "${REGKEY}" /reg:64 /ve /d "$INSTDIR\alloy-windows-amd64.exe"' Pop $0 # Ignore return result ${EndIf}