From 5f218fdf7fc3e99809b4ac99a114ab7f92242808 Mon Sep 17 00:00:00 2001 From: dan_s Date: Mon, 23 Feb 2026 12:59:30 -0600 Subject: [PATCH] Changed head -4 to head -3 in both scripts so the version picks up only MAJOR.MINOR.REVISION (3.10.5), dropping BUILD (50). The BUILD number is an internal field, not part of the user-facing release version. --- build-docker-release.sh | 11 ++++++----- util/build-win.sh | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/build-docker-release.sh b/build-docker-release.sh index e1a3062b9..5254cc5e0 100755 --- a/build-docker-release.sh +++ b/build-docker-release.sh @@ -24,7 +24,7 @@ cd /hush3 # Package release echo "Creating Linux release package..." -VERSION=$(grep -oP 'define\(_CLIENT_VERSION.*?,\s*\K[0-9]+' configure.ac | head -4 | tr '\n' '.' | sed 's/\.$//') +VERSION=$(grep -oP 'define\(_CLIENT_VERSION.*?,\s*\K[0-9]+' configure.ac | head -3 | tr '\n' '.' | sed 's/\.$//') VERSION=${VERSION:-3.10.5} RELEASE_DIR="release-linux" mkdir -p "$RELEASE_DIR" @@ -34,13 +34,14 @@ cp src/hushd src/hush-cli src/hush-tx "$RELEASE_DIR/" cp asmap.dat sapling-spend.params sapling-output.params "$RELEASE_DIR/" 2>/dev/null || true cp src/hush-arrakis-chain src/dragonxd src/dragonx-cli "$RELEASE_DIR/" -rm -f "hush-${VERSION}-linux64.zip" +# Create ZIP inside release dir (matches --win-release layout) +rm -f "$RELEASE_DIR/hush-${VERSION}-linux64.zip" cd "$RELEASE_DIR" -zip -9 "../hush-${VERSION}-linux64.zip" * +zip -9 "hush-${VERSION}-linux64.zip" * cd .. -echo "Release package created: hush-${VERSION}-linux64.zip" -ls -lh "hush-${VERSION}-linux64.zip" +echo "Release package created: $RELEASE_DIR/hush-${VERSION}-linux64.zip" +ls -lh "$RELEASE_DIR/hush-${VERSION}-linux64.zip" # Fix ownership of all files created by root so host user can access them if [ -n "${HOST_UID:-}" ] && [ -n "${HOST_GID:-}" ]; then diff --git a/util/build-win.sh b/util/build-win.sh index 2f4b4809c..8a6fc8eba 100755 --- a/util/build-win.sh +++ b/util/build-win.sh @@ -45,8 +45,8 @@ CC="${CC} -g " CXX="${CXX} -g " make V=1 hushd.exe hush-cli.exe hush-tx.exe # Create release package cd $WD echo "Creating Windows release package..." -VERSION=$(grep -oP 'define\(_CLIENT_VERSION.*?,\s*\K[0-9]+' configure.ac | head -4 | tr '\n' '.' | sed 's/\.$//') -VERSION=${VERSION:-3.10.4} +VERSION=$(grep -oP 'define\(_CLIENT_VERSION.*?,\s*\K[0-9]+' configure.ac | head -3 | tr '\n' '.' | sed 's/\.$//') +VERSION=${VERSION:-3.10.5} RELEASE_DIR="release-win64" mkdir -p "$RELEASE_DIR"