From 2fb44521d54f335fa42a3ebc8200b3ba41173cd0 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 13 Mar 2026 10:48:20 +0100 Subject: [PATCH] Adjust config script to avoid confusing version output --- scripts/configure_firestorm.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh index 8f8eba388d..45d4a48906 100755 --- a/scripts/configure_firestorm.sh +++ b/scripts/configure_firestorm.sh @@ -434,12 +434,12 @@ if [ \( $WANTS_VERSION -eq $TRUE \) -o \( $WANTS_CONFIG -eq $TRUE \) ] ; then fi export revision=${buildVer} - majorVer=`cat indra/newview/VIEWER_VERSION.txt | cut -d "." -f 1` - minorVer=`cat indra/newview/VIEWER_VERSION.txt | cut -d "." -f 2` - patchVer=`cat indra/newview/VIEWER_VERSION.txt | cut -d "." -f 3` + majorVer=`cat indra/newview/VIEWER_VERSION_FS.txt | cut -d "." -f 1` + minorVer=`cat indra/newview/VIEWER_VERSION_FS.txt | cut -d "." -f 2` + patchVer=`cat indra/newview/VIEWER_VERSION_FS.txt | cut -d "." -f 3` gitHash=`git describe --always --exclude '*'` - echo "Channel : ${CHANNEL}" - echo "Version : ${majorVer}.${minorVer}.${patchVer}.${buildVer} [${gitHash}]" + echo "Channel: ${CHANNEL}" + echo "Version: ${majorVer}.${minorVer}.${patchVer}.${buildVer} [${gitHash}]" GITHASH=-DVIEWER_VERSION_GITHASH=\"${gitHash}\" popd fi