diff options
| author | Zoltan Herpai <wigyori@uid0.hu> | 2016-06-24 20:17:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-24 20:17:26 +0200 |
| commit | 6eb05f9f38210bfd7cb667fab1b00e5ebd737556 (patch) | |
| tree | 8adb7f0946f1c0f2fba4cc28999d915b167af464 /scripts | |
| parent | 282b917e47d9ae5017e1e426face9b75cb7aabd0 (diff) | |
| parent | 64de7165e5bce0d6f811795bc5a0a81165eb58ca (diff) | |
| download | master-187ad058-6eb05f9f38210bfd7cb667fab1b00e5ebd737556.tar.gz master-187ad058-6eb05f9f38210bfd7cb667fab1b00e5ebd737556.tar.bz2 master-187ad058-6eb05f9f38210bfd7cb667fab1b00e5ebd737556.zip | |
Merge pull request #12 from wigyori/master
update oxnas target, update ipq806x target, create trunk tag and update revisioning accordingly
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/getver.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/getver.sh b/scripts/getver.sh index 6cf7797519..549d529e42 100755 --- a/scripts/getver.sh +++ b/scripts/getver.sh @@ -18,8 +18,8 @@ try_svn() { try_git() { git rev-parse --git-dir >/dev/null 2>&1 || return 1 - REV="$(git log | grep -m 1 git-svn-id | awk '{ gsub(/.*@/, "", $0); print $1 }')" - REV="${REV:+r$REV}" + REV="$(git describe --tags | sed "s/trunk-\([0-9]*\)-.*/\1/g")" + REV="$((REV+12009))" [ -n "$REV" ] } @@ -30,5 +30,5 @@ try_hg() { [ -n "$REV" ] } -try_version || try_svn || try_git || try_hg || REV="unknown" +try_version || try_git || try_hg || REV="unknown" echo "$REV" |