From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 6/8] make.sh: Tidy up Git commands Date: Tue, 11 Feb 2020 14:28:51 +0000 Message-ID: <20200211142853.8561-7-michael.tremer@ipfire.org> In-Reply-To: <20200211142853.8561-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5484625687463385012==" List-Id: --===============5484625687463385012== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable No functional changes. Just making them shorter. Signed-off-by: Michael Tremer --- make.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/make.sh b/make.sh index 34cc35f02..ba393bd65 100755 --- a/make.sh +++ b/make.sh @@ -28,15 +28,17 @@ SNAME=3D"ipfire" # Short name VERSION=3D"2.25" # Version number CORE=3D"142" # Core Level (Filename) PAKFIRE_CORE=3D"141" # Core Level (PAKFIRE) -GIT_BRANCH=3D`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN=3D"www.ipfire.org" # Software slogan CONFIG_ROOT=3D/var/ipfire # Configuration rootdir NICE=3D10 # Nice level MAX_RETRIES=3D1 # prefetch/check loop BUILD_IMAGES=3D1 # Flash and Xen Downloader KVER=3D`grep --max-count=3D1 VER lfs/linux | awk '{ print $3 }'` -GIT_TAG=3D$(git tag | tail -1) # Git Tag -GIT_LASTCOMMIT=3D$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last comm= it + +# Information from Git +GIT_BRANCH=3D"$(git rev-parse --abbrev-ref HEAD)" # Git Branch +GIT_TAG=3D"$(git tag | tail -1)" # Git Tag +GIT_LASTCOMMIT=3D"$(git rev-parse --verify HEAD)" # Last commit =20 TOOLCHAINVER=3D20200108 =20 @@ -518,7 +520,7 @@ prepareenv() { SYSTEM_RELEASE=3D"${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS" ;; *) - SYSTEM_RELEASE=3D"${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_= LASTCOMMIT$GIT_STATUS" + SYSTEM_RELEASE=3D"${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/${GIT= _LASTCOMMIT:0:8}$GIT_STATUS" ;; esac =20 --=20 2.20.1 --===============5484625687463385012==--