From: Felix Fietkau <nbd@nbd.name>
Date: Sat, 9 Jul 2016 18:00:50 +0000 (+0200)
Subject: scripts/getver.sh: fix revision number on BSD/MacOS
X-Git-Tag: v17.01.0-rc1~2113
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c19381dfca92a2eb80d35f294515a777da2cb7be;p=openwrt%2Fopenwrt.git

scripts/getver.sh: fix revision number on BSD/MacOS

Strip leading whitespace from wc -l output

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

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