diff options
| author | Karel Kočí <karel.koci@nic.cz> | 2018-01-31 13:31:09 +0100 |
|---|---|---|
| committer | Karel Kočí <karel.koci@nic.cz> | 2018-01-31 13:31:09 +0100 |
| commit | c6bed5cb193a7d42834cedee12fe6ee559f17620 (patch) | |
| tree | 5619714dc9ba3d2c7b6e933f09f9fb382d31af25 | |
| parent | 487926eb9eaf5e909b3f81b28cac2a1c74de3699 (diff) | |
| download | turris-myrepo-c6bed5cb193a7d42834cedee12fe6ee559f17620.tar.gz turris-myrepo-c6bed5cb193a7d42834cedee12fe6ee559f17620.tar.bz2 turris-myrepo-c6bed5cb193a7d42834cedee12fe6ee559f17620.zip | |
Add option to change taget commit in updater-ng-auto
| -rwxr-xr-x | utils/updater-ng-auto.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/utils/updater-ng-auto.sh b/utils/updater-ng-auto.sh index a4d4194..d9157a0 100755 --- a/utils/updater-ng-auto.sh +++ b/utils/updater-ng-auto.sh @@ -2,6 +2,7 @@ # This script check if updater doesn't contain new commit and if so it bumps # automatically. +COMMIT=HEAD UPDATER_REPO=https://kkoci@gitlab.labs.nic.cz/turris/updater.git UPDATER_REPO_PATH=/tmp/myrepo_updater_repo @@ -18,9 +19,9 @@ else git $GIT_ARGS fetch $UPDATER_REPO master:master fi # Get info -HASH="$(git $GIT_ARGS rev-parse HEAD)" -VERSION="$(git $GIT_ARGS describe --abbrev=0 --tags | sed 's/^v//')" -RELEASE="$(($(git $GIT_ARGS rev-list --count v$VERSION..HEAD) + 1))" +HASH="$(git $GIT_ARGS rev-parse $COMMIT)" +VERSION="$(git $GIT_ARGS describe --abbrev=0 --tags $COMMIT | sed 's/^v//')" +RELEASE="$(($(git $GIT_ARGS rev-list --count v$VERSION..$COMMIT) + 1))" VERSION="$VERSION.99999" # Now replace stuff in Makefile |