|
@@ -39,7 +39,7 @@ __die_if() {
|
39
|
39
|
old_c)
|
40
|
40
|
x=$(__ver_info nextver_g)
|
41
|
41
|
__ver_info currver_c \
|
42
|
|
- | grep -qFx "$x" config.mk \
|
|
42
|
+ | grep -qFx "$x" \
|
43
|
43
|
|| die "new version not in config.mk: $x"
|
44
|
44
|
;;
|
45
|
45
|
esac
|
|
@@ -63,9 +63,10 @@ __ver_info() {
|
63
|
63
|
#
|
64
|
64
|
local info="$1"
|
65
|
65
|
case "$info" in
|
66
|
|
- lastver_g) __git_info lasttag | sed s/v$// ;;
|
|
66
|
+ lastver_g) __git_info lasttag | sed s/^v// ;;
|
67
|
67
|
nextver_g) __make_ver "$level" "$(__ver_info lastver_g)" ;;
|
68
|
|
- currver_c) grep -m 1 -w VERSION config.mk | cut -d = -f 2 | xargs echo ;;
|
|
68
|
+ currver_c) grep -m 1 -w VERSION config.mk \
|
|
69
|
+ | sed 's/ *= */=/' | cut -d = -f 2 | xargs echo ;;
|
69
|
70
|
nextver_c) __make_ver "$level" "$(__ver_info currver_c)" ;;
|
70
|
71
|
esac
|
71
|
72
|
}
|
|
@@ -118,7 +119,7 @@ __release() {
|
118
|
119
|
__git_msg_vbump() {
|
119
|
120
|
echo "Bump version"
|
120
|
121
|
echo ""
|
121
|
|
- __git_info reldiff | sed 's/^/ * '
|
|
122
|
+ __git_info reldiff | sed 's/^/ * /'
|
122
|
123
|
}
|
123
|
124
|
|
124
|
125
|
__vbump() {
|