From f48643e5b3a86c25a7387cf6c14e2807fdd8a482 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 11 Feb 2020 14:28:52 +0000
Subject: [PATCH] make.sh: Cleanup code that builds ${SYSTEM_RELEASE}

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
 make.sh | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/make.sh b/make.sh
index ba393bd656..d46282b8e1 100755
--- a/make.sh
+++ b/make.sh
@@ -509,21 +509,25 @@ prepareenv() {
 	rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null
 
 	# Prepare string for /etc/system-release.
-	SYSTEM_RELEASE="${NAME} ${VERSION} (${BUILD_ARCH})"
-	if [ "$(git status -s | wc -l)" == "0" ]; then
-	GIT_STATUS=""
-	else
-	GIT_STATUS="-dirty"
-	fi
-	case "$GIT_BRANCH" in
-	core*|beta?|rc?)
-		SYSTEM_RELEASE="${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS"
-		;;
-	*)
-		SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/${GIT_LASTCOMMIT:0:8}$GIT_STATUS"
-		;;
+	local system_release="${NAME} ${VERSION} (${BUILD_ARCH})"
+
+	case "${GIT_BRANCH}" in
+		core*|beta?|rc?)
+			system_release="${system_release} - ${GIT_BRANCH}"
+			;;
+		*)
+			system_release="${system_release} - Development Build: ${GIT_BRANCH}/${GIT_LASTCOMMIT:0:8}"
+			;;
 	esac
 
+	# Append -dirty tag for local changes
+	if [ "$(git status -s | wc -l)" != "0" ]; then
+		system_release="${system_release}-dirty"
+	fi
+
+	# Export variable
+	SYSTEM_RELEASE="${system_release}"
+
 	# Setup ccache cache size
 	enterchroot ccache --max-size="${CCACHE_CACHE_SIZE}" >/dev/null
 }
-- 
2.39.2