Pārlūkot izejas kodu

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

Strip leading whitespace from wc -l output

Signed-off-by: Felix Fietkau <[email protected]>
Felix Fietkau 9 gadi atpakaļ
vecāks
revīzija
c19381dfca
1 mainītis faili ar 2 papildinājumiem un 2 dzēšanām
  1. 2 2
      scripts/getver.sh

+ 2 - 2
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