@@ -3,12 +3,9 @@ package main
3
3
import (
4
4
"fmt"
5
5
"os"
6
- "path"
7
6
"runtime/debug"
8
- "strings"
9
7
10
8
"github.com/alecthomas/kingpin/v2"
11
- "github.com/caarlos0/svu/v2/internal/git"
12
9
"github.com/caarlos0/svu/v2/internal/svu"
13
10
)
14
11
@@ -21,10 +18,10 @@ var (
21
18
currentCmd = app .Command ("current" , "prints current version" ).Alias ("c" )
22
19
preReleaseCmd = app .Command ("prerelease" , "new pre release version based on the next version calculated from git log" ).
23
20
Alias ("pr" )
24
- preRelease = app .Flag ("pre-release" , "adds a pre-release suffix to the version, without the semver mandatory dash prefix" ).
21
+ preRelease = app .Flag ("pre-release" , "adds a pre-release suffix to the version, without the semver mandatory dash prefix" ).
25
22
String ()
26
- pattern = app .Flag ("pattern" , "limits calculations to be based on tags matching the given pattern" ).Default ( defaults ( "pattern" )). String ()
27
- prefix = app .Flag ("prefix" , "set a custom prefix" ).Default (defaults ( "prefix" ) ).String ()
23
+ pattern = app .Flag ("pattern" , "limits calculations to be based on tags matching the given pattern" ).String ()
24
+ prefix = app .Flag ("prefix" , "set a custom prefix" ).Default ("v" ).String ()
28
25
stripPrefix = app .Flag ("strip-prefix" , "strips the prefix from the tag" ).Default ("false" ).Bool ()
29
26
build = app .Flag ("build" , "adds a build suffix to the version, without the semver mandatory plug prefix" ).
30
27
String ()
40
37
Bool ()
41
38
)
42
39
43
- func defaults (flag string ) string {
44
- var def , pat string
45
- switch flag {
46
- case "prefix" :
47
- def , pat = "v" , "v"
48
- case "pattern" :
49
- def , pat = "" , "*"
50
- default :
51
- return ""
52
- }
53
-
54
- cwd , wdErr := os .Getwd ()
55
- gitRoot , grErr := git .Root ()
56
- if wdErr == nil && grErr == nil && cwd != gitRoot {
57
- prefix := strings .TrimPrefix (cwd , gitRoot )
58
- prefix = strings .TrimPrefix (prefix , string (os .PathSeparator ))
59
- prefix = strings .TrimSuffix (prefix , string (os .PathSeparator ))
60
- return path .Join (prefix , pat )
61
- }
62
-
63
- return def
64
- }
65
-
66
40
func main () {
67
41
app .Author ("Carlos Alexandro Becker <carlos@becker.software>" )
68
42
app .Version (buildVersion (version , commit , date , builtBy ))
0 commit comments