KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Strip leading whitespace from wc -l output

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-07-09 20:00:50 +02:00
parent 916aebb300
commit c19381dfca
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/getver.sh
View file

@ -24,8 +24,8 @@ try_git() {
;; ;;
*) *)
UPSTREAM_BASE="$(git merge-base $GET_REV origin/master)" UPSTREAM_BASE="$(git merge-base $GET_REV origin/master)"
UPSTREAM_REV="$(git rev-list reboot..$UPSTREAM_BASE | wc -l)" UPSTREAM_REV="$(git rev-list reboot..$UPSTREAM_BASE | wc -l | awk '{print $1}')"
REV="$(git rev-list reboot..$GET_REV | wc -l)" 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 if [ -n "$REV" -a -n "$UPSTREAM_REV" -a "$REV" -gt "$UPSTREAM_REV" ]; then
REV="r${UPSTREAM_REV}+$((REV - UPSTREAM_REV))" REV="r${UPSTREAM_REV}+$((REV - UPSTREAM_REV))"
else else