aboutsummaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorKarel Kočí <karel.koci@nic.cz>2017-11-02 17:17:11 +0100
committerKarel Kočí <karel.koci@nic.cz>2017-11-02 17:17:11 +0100
commit7e3c1561d5dd5e03926aab60b81c62c8b728cac4 (patch)
tree36efdb6b02dfe7564f9d16e87a9f4c67ca3b9544 /utils
parent71b69b460b8f87a99178ffda14ff0c06ec304bbe (diff)
downloadturris-myrepo-7e3c1561d5dd5e03926aab60b81c62c8b728cac4.tar.gz
turris-myrepo-7e3c1561d5dd5e03926aab60b81c62c8b728cac4.tar.bz2
turris-myrepo-7e3c1561d5dd5e03926aab60b81c62c8b728cac4.zip
Update updaer-ng-auto
Diffstat (limited to 'utils')
-rwxr-xr-xutils/updater-ng-auto.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/utils/updater-ng-auto.sh b/utils/updater-ng-auto.sh
index 23eea64..a4d4194 100755
--- a/utils/updater-ng-auto.sh
+++ b/utils/updater-ng-auto.sh
@@ -19,8 +19,9 @@ else
fi
# Get info
HASH="$(git $GIT_ARGS rev-parse HEAD)"
-VERSION="$(git $GIT_ARGS describe --abbrev=0 --tags | sed 's/^v//').99999"
-RELEASE="$(($(git $GIT_ARGS rev-list --count $VERSION..HEAD) + 1))"
+VERSION="$(git $GIT_ARGS describe --abbrev=0 --tags | sed 's/^v//')"
+RELEASE="$(($(git $GIT_ARGS rev-list --count v$VERSION..HEAD) + 1))"
+VERSION="$VERSION.99999"
# Now replace stuff in Makefile
sed -i "s/^PKG_VERSION:=.*/PKG_VERSION:=$VERSION/;s/^PKG_RELEASE:=.*/PKG_RELEASE:=$RELEASE/;s/^PKG_SOURCE_VERSION:=.*/PKG_SOURCE_VERSION:=$HASH/" $1/updater-ng-auto/Makefile