mirror of
https://github.com/openwrt/openwrt.git
synced 2024-11-27 11:54:04 +08:00
scripts/getver.sh: fix revision number on BSD/MacOS
Strip leading whitespace from wc -l output Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
parent
916aebb300
commit
c19381dfca
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user