Skip to content

Commit

Permalink
Fix Chocolatey installer script
Browse files Browse the repository at this point in the history
- Set -e
- Use the correct filename
  • Loading branch information
bernd committed Dec 5, 2022
1 parent 024406b commit dc4c5f5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ sign-windows-installer:

package-chocolatey: ## Create Chocolatey .nupkg file
# This needs to run in a Docker container based on the Dockerfile.chocolatey image!
dist/chocolatey/gensha.sh $(COLLECTOR_VERSION) $(COLLECTOR_REVISION) $(COLLECTOR_VERSION_SUFFIX)
dist/chocolatey/gensha.sh $(COLLECTOR_VERSION) $(WINDOWS_INSTALLER_VERSION)
# The fourth number in Chocolatey (NuGet) is the revision.
# See: https://learn.microsoft.com/en-us/nuget/concepts/package-versioning#where-nugetversion-diverges-from-semantic-versioning
cd dist/chocolatey && choco pack graylog-sidecar.nuspec --version $(CHOCOLATEY_VERSION) --out ../pkg
Expand Down
15 changes: 6 additions & 9 deletions dist/chocolatey/gensha.sh
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
#!/usr/bin/env bash
# gensha.sh - Generate sha256 file for Chocolatey package and update chocolateyinstall.ps1 with the correct version and checksum.

COLLECTOR_VERSION=$1
COLLECTOR_REVISION=$2
COLLECTOR_VERSION_SUFFIX=$3
set -eo pipefail

if [[ ${COLLECTOR_VERSION_SUFFIX} == "-SNAPSHOT" ]]; then
COLLECTOR_CHECKSUM=$(sha256sum dist/pkg/graylog_sidecar_installer_${COLLECTOR_VERSION}-${COLLECTOR_REVISION}.SNAPSHOT.exe | cut -d" " -f1)
else
COLLECTOR_CHECKSUM=$(sha256sum dist/pkg/graylog_sidecar_installer_${COLLECTOR_VERSION}-${COLLECTOR_REVISION}.exe | cut -d" " -f1)
fi
COLLECTOR_VERSION="$1"
COLLECTOR_INSTALLER_VERSION="$2"

COLLECTOR_CHECKSUM="$(sha256sum dist/pkg/graylog_sidecar_installer_${COLLECTOR_INSTALLER_VERSION}.exe | cut -d" " -f1)"

root_url="https://downloads.graylog.org/releases/graylog-collector-sidecar"
version_url="${root_url}/${COLLECTOR_VERSION}/graylog_sidecar_installer_${COLLECTOR_VERSION}-${COLLECTOR_REVISION}.exe"
version_url="${root_url}/${COLLECTOR_VERSION}/graylog_sidecar_installer_${COLLECTOR_INSTALLER_VERSION}.exe"

sed -e "s,%%CHECKSUM%%,$COLLECTOR_CHECKSUM,g" \
-e "s,%%URL%%,$version_url,g" \
Expand Down

0 comments on commit dc4c5f5

Please sign in to comment.