Browse Source

Fix tag format errors

v0.0.0 vs vv0.0.0 vs 0.0.0
Alois Mahdal 9 years ago
parent
commit
8b044c5abc
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      src/include/release.sh

+ 2
- 2
src/include/release.sh View File

39
         old_c)
39
         old_c)
40
             x=$(__ver_info nextver_g)
40
             x=$(__ver_info nextver_g)
41
             __ver_info currver_c \
41
             __ver_info currver_c \
42
-              | grep -qFx "$x" config.mk \
42
+              | grep -qFx "$x" \
43
              || die "new version not in config.mk: $x"
43
              || die "new version not in config.mk: $x"
44
             ;;
44
             ;;
45
     esac
45
     esac
63
     #
63
     #
64
     local info="$1"
64
     local info="$1"
65
     case "$info" in
65
     case "$info" in
66
-        lastver_g)  __git_info lasttag | sed s/v$// ;;
66
+        lastver_g)  __git_info lasttag | sed s/^v// ;;
67
         nextver_g)  __make_ver "$level" "$(__ver_info lastver_g)" ;;
67
         nextver_g)  __make_ver "$level" "$(__ver_info lastver_g)" ;;
68
         currver_c)  grep -m 1 -w VERSION config.mk \
68
         currver_c)  grep -m 1 -w VERSION config.mk \
69
                      | sed 's/ *= */=/' | cut -d = -f 2 | xargs echo ;;
69
                      | sed 's/ *= */=/' | cut -d = -f 2 | xargs echo ;;