Commit dc4c5f5 1 parent 024406b commit dc4c5f5 Copy full SHA for dc4c5f5
File tree 2 files changed +7
-10
lines changed
2 files changed +7
-10
lines changed Original file line number Diff line number Diff line change @@ -134,7 +134,7 @@ sign-windows-installer:
134
134
135
135
package-chocolatey : # # Create Chocolatey .nupkg file
136
136
# This needs to run in a Docker container based on the Dockerfile.chocolatey image!
137
- dist/chocolatey/gensha.sh $(COLLECTOR_VERSION ) $(COLLECTOR_REVISION ) $( COLLECTOR_VERSION_SUFFIX )
137
+ dist/chocolatey/gensha.sh $(COLLECTOR_VERSION ) $(WINDOWS_INSTALLER_VERSION )
138
138
# The fourth number in Chocolatey (NuGet) is the revision.
139
139
# See: https://learn.microsoft.com/en-us/nuget/concepts/package-versioning#where-nugetversion-diverges-from-semantic-versioning
140
140
cd dist/chocolatey && choco pack graylog-sidecar.nuspec --version $(CHOCOLATEY_VERSION ) --out ../pkg
Original file line number Diff line number Diff line change 1
1
#! /usr/bin/env bash
2
2
# gensha.sh - Generate sha256 file for Chocolatey package and update chocolateyinstall.ps1 with the correct version and checksum.
3
3
4
- COLLECTOR_VERSION=$1
5
- COLLECTOR_REVISION=$2
6
- COLLECTOR_VERSION_SUFFIX=$3
4
+ set -eo pipefail
7
5
8
- if [[ ${COLLECTOR_VERSION_SUFFIX} == " -SNAPSHOT" ]]; then
9
- COLLECTOR_CHECKSUM=$( sha256sum dist/pkg/graylog_sidecar_installer_${COLLECTOR_VERSION} -${COLLECTOR_REVISION} .SNAPSHOT.exe | cut -d" " -f1)
10
- else
11
- COLLECTOR_CHECKSUM=$( sha256sum dist/pkg/graylog_sidecar_installer_${COLLECTOR_VERSION} -${COLLECTOR_REVISION} .exe | cut -d" " -f1)
12
- fi
6
+ COLLECTOR_VERSION=" $1 "
7
+ COLLECTOR_INSTALLER_VERSION=" $2 "
8
+
9
+ COLLECTOR_CHECKSUM=" $( sha256sum dist/pkg/graylog_sidecar_installer_${COLLECTOR_INSTALLER_VERSION} .exe | cut -d" " -f1) "
13
10
14
11
root_url=" https://downloads.graylog.org/releases/graylog-collector-sidecar"
15
- version_url=" ${root_url} /${COLLECTOR_VERSION} /graylog_sidecar_installer_${COLLECTOR_VERSION} - ${COLLECTOR_REVISION } .exe"
12
+ version_url=" ${root_url} /${COLLECTOR_VERSION} /graylog_sidecar_installer_${COLLECTOR_INSTALLER_VERSION } .exe"
16
13
17
14
sed -e " s,%%CHECKSUM%%,$COLLECTOR_CHECKSUM ,g" \
18
15
-e " s,%%URL%%,$version_url ,g" \
You can’t perform that action at this time.
0 commit comments