Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release/v1.4] Fix Windows installer #1767

Merged
merged 3 commits into from
Sep 26, 2024
Merged

[release/v1.4] Fix Windows installer #1767

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fcf7358
fix(installer): do not quote servicepath in registy (#1765)
jkroepke Sep 26, 2024
0729c89
Update VERSION
ptodev Sep 26, 2024
638650f
Fix typos
ptodev Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 binary path in registy. (@jkroepke)

v1.4.0
-----------------

Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
#
# Lines starting with "#" and blank lines are ignored.

v1.4.0
v1.4.1
2 changes: 1 addition & 1 deletion docs/sources/_index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packaging/windows/install_script.nsis
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down