From patchwork Tue Feb 11 14:28:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2771 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48H4sV4j1bz3xY8 for ; Tue, 11 Feb 2020 14:29:18 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48H4sQ5Ccdz12S; Tue, 11 Feb 2020 14:29:14 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48H4sP3QPlz2yj7; Tue, 11 Feb 2020 14:29:13 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48H4sM2PWHz2yCr for ; Tue, 11 Feb 2020 14:29:11 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48H4sL5VKXzBD; Tue, 11 Feb 2020 14:29:10 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1581431350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F7H3wl3hsOjv0HXczlLEYIs+n9fvBJNmdVzmxGLF1jI=; b=2hiQ/PLTmGFIJOgqCjM0eDd3vUddQPTuzib/iNze5LWfdo82Jx0Dl3wQqA2IxePu7iVjzK 8+Huv7vRzYV6KfAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1581431350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F7H3wl3hsOjv0HXczlLEYIs+n9fvBJNmdVzmxGLF1jI=; b=cb7OQSgHbN5fhk9BUEwotDLL2RGf93h8RVnmtWSWngSYFuja1HsqPhbOsiWvVK+KVFiFSI pc31tH6MwXJcKAOzT5e5pF1XnBZ9+57M8cPD4jJ3H0QIOfwhm8Sc664ZAGNPMg6MFrzTQU ZOQJjY7Pp8wflqXFYtS270RRIhdwrLh6DHzam1DPO85u2s2ata8v9NzO0yJWbTPs0oO6hN ZZWjozmQIjvTWauk8ib7oTTHQxexgGggupcQUXZWRt06PsEwKihe7ftEtw0051g6FcBK9m yEZaWF3un5oPjzCHeKf9C1mCA8eJWGv2Gt3wtJuKRUuJSOrpSIVvU5AdKmFvTw== 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> References: <20200211142853.8561-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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="ipfire" # Short name VERSION="2.25" # Version number CORE="142" # Core Level (Filename) PAKFIRE_CORE="141" # Core Level (PAKFIRE) -GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 # Nice level MAX_RETRIES=1 # prefetch/check loop BUILD_IMAGES=1 # Flash and Xen Downloader KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` -GIT_TAG=$(git tag | tail -1) # Git Tag -GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit + +# Information from Git +GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)" # Git Branch +GIT_TAG="$(git tag | tail -1)" # Git Tag +GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)" # Last commit TOOLCHAINVER=20200108 @@ -518,7 +520,7 @@ prepareenv() { SYSTEM_RELEASE="${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS" ;; *) - SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS" + SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/${GIT_LASTCOMMIT:0:8}$GIT_STATUS" ;; esac