From c19381dfca92a2eb80d35f294515a777da2cb7be Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@nbd.name>
Date: Sat, 9 Jul 2016 20:00:50 +0200
Subject: [PATCH] scripts/getver.sh: fix revision number on BSD/MacOS
Strip leading whitespace from wc -l output
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
scripts/getver.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/getver.sh b/scripts/getver.sh
index fa2e676925..5d8788f202 100755
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -24,8 +24,8 @@ try_git() {
;;
*)
UPSTREAM_BASE="$(git merge-base $GET_REV origin/master)"
- UPSTREAM_REV="$(git rev-list reboot..$UPSTREAM_BASE | wc -l)"
- REV="$(git rev-list reboot..$GET_REV | wc -l)"
+ UPSTREAM_REV="$(git rev-list reboot..$UPSTREAM_BASE | wc -l | awk '{print $1}')"
+ REV="$(git rev-list reboot..$GET_REV | wc -l | awk '{print $1}')"
if [ -n "$REV" -a -n "$UPSTREAM_REV" -a "$REV" -gt "$UPSTREAM_REV" ]; then
REV="r${UPSTREAM_REV}+$((REV - UPSTREAM_REV))"
else
--
GitLab