diff --git a/bump.sh b/bump.sh index 132890aa..3facbe9a 100755 --- a/bump.sh +++ b/bump.sh @@ -1,16 +1,19 @@ #!/bin/sh # Use passed argument as new tag -[ $# -eq 1 ] && git tag "$@" - -./version.sh +[ $# -eq 1 ] && { + git tag "$@" || exit 1 +} # shellcheck disable=SC2016 tag_prev=$(git tag -l | tail -2 | head -1) tag_curr=$(git tag -l | tail -1) +./version.sh "$tag_curr" + sed -r "s/${tag_prev}/${tag_curr}/g" -i README.md CMakeLists.txt contrib/lemonbuddy.aur/PKGBUILD contrib/lemonbuddy.aur/.SRCINFO git add README.md CMakeLists.txt contrib/lemonbuddy.aur/PKGBUILD contrib/lemonbuddy.aur/.SRCINFO +git add -u include/version.hpp git commit -m "build: Bump version to ${tag_curr}" # Recreate the tag to include the last commit diff --git a/version.sh b/version.sh index 74968096..a2428f66 100755 --- a/version.sh +++ b/version.sh @@ -5,7 +5,11 @@ msg() { } main() { - version="$(git describe --tags --dirty=-dev)" + version="$1" + + [ "$version" ] || { + version="$(git describe --tags --dirty=-dev)" + } msg "Current version: ${version}"