1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
diff --git a/cmd/spectre/main.go b/cmd/spectre/main.go
index a39998126babfe883cf79b0f60c202af7922f1e0..1a3487e0aa94e86b1fe55f6b8a3d5c8edaf964eb 100644
--- a/cmd/spectre/main.go
+++ b/cmd/spectre/main.go
@@ -10,7 +10,7 @@ "go.jolheiser.com/go-spectre"
)
func main() {
- pw, err := doMain(os.Args[1:])
+ pw, err := maine(os.Args[1:])
if err != nil {
fmt.Println(err)
return
@@ -18,26 +18,34 @@ }
fmt.Println(pw)
}
-func doMain(args []string) (string, error) {
+func maine(args []string) (string, error) {
fs := flag.NewFlagSet("spectre", flag.ExitOnError)
fs.Usage = func() {
fmt.Fprintln(fs.Output(), "spectre [FLAGS] [site]")
fs.PrintDefaults()
}
usernameFlag := fs.String("username", "", "username")
+ fs.StringVar(usernameFlag, "u", *usernameFlag, "--username")
secretFlag := fs.String("secret", "", "secret")
+ fs.StringVar(secretFlag, "s", *secretFlag, "--secret")
counterFlag := fs.Int("counter", 1, "counter")
- scoperFlag := fs.String("scoper", "com.lyndir.masterpassword", "scoper base")
+ fs.IntVar(counterFlag, "c", *counterFlag, "--counter")
+ baseFlag := fs.String("base", "com.lyndir.masterpassword", "scoper base")
+ fs.StringVar(baseFlag, "b", *baseFlag, "--base")
scopeFlag := spectre.Authentication
- fs.Func("scope", "scope", func(s string) (err error) {
+ scopeFn := func(s string) (err error) {
scopeFlag, err = spectre.ParseScope(s)
return
- })
+ }
+ fs.Func("scope", "scope", scopeFn)
+ fs.Func("S", "--scope", scopeFn)
var templateFlag spectre.Template
- fs.Func("template", "template", func(s string) (err error) {
+ templateFn := func(s string) (err error) {
templateFlag, err = spectre.ParseTemplate(s)
return
- })
+ }
+ fs.Func("template", "template", templateFn)
+ fs.Func("t", "--template", templateFn)
if err := fs.Parse(args); err != nil {
return "", err
@@ -59,7 +67,7 @@ }
}
s, err := spectre.New(*usernameFlag, *secretFlag, spectre.WithScoper(spectre.SimpleScoper{
- Key: *scoperFlag,
+ Key: *baseFlag,
}))
if err != nil {
return "", err
|