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.
This commit is contained in:
dan_s
2026-02-23 12:59:30 -06:00
parent e4e22abf4c
commit 5f218fdf7f
2 changed files with 8 additions and 7 deletions

View File

@@ -24,7 +24,7 @@ cd /hush3
# Package release # Package release
echo "Creating Linux release package..." 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} VERSION=${VERSION:-3.10.5}
RELEASE_DIR="release-linux" RELEASE_DIR="release-linux"
mkdir -p "$RELEASE_DIR" 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 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/" 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" cd "$RELEASE_DIR"
zip -9 "../hush-${VERSION}-linux64.zip" * zip -9 "hush-${VERSION}-linux64.zip" *
cd .. cd ..
echo "Release package created: hush-${VERSION}-linux64.zip" echo "Release package created: $RELEASE_DIR/hush-${VERSION}-linux64.zip"
ls -lh "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 # Fix ownership of all files created by root so host user can access them
if [ -n "${HOST_UID:-}" ] && [ -n "${HOST_GID:-}" ]; then if [ -n "${HOST_UID:-}" ] && [ -n "${HOST_GID:-}" ]; then

View File

@@ -45,8 +45,8 @@ CC="${CC} -g " CXX="${CXX} -g " make V=1 hushd.exe hush-cli.exe hush-tx.exe
# Create release package # Create release package
cd $WD cd $WD
echo "Creating Windows release package..." echo "Creating Windows 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.4} VERSION=${VERSION:-3.10.5}
RELEASE_DIR="release-win64" RELEASE_DIR="release-win64"
mkdir -p "$RELEASE_DIR" mkdir -p "$RELEASE_DIR"