Skip to content

Commit a564ba8

Browse files
committed
fix(plugin): fixed ops -plugin
Made ops -plugin work as requested in apache/openserverless#88
1 parent d86f8c4 commit a564ba8

1 file changed

Lines changed: 16 additions & 8 deletions

File tree

plugin.go

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,28 @@ import (
3232
)
3333

3434
func pluginTool() error {
35-
flag := flag.NewFlagSet("plugin", flag.ExitOnError)
36-
flag.Usage = printPluginUsage
37-
38-
err := flag.Parse(os.Args[1:])
35+
flagSet := flag.NewFlagSet("plugin", flag.ExitOnError)
36+
flagSet.Usage = printPluginUsage
37+
err := flagSet.Parse(os.Args[1:])
3938
if err != nil {
4039
return err
4140
}
4241

43-
if flag.NArg() != 1 {
44-
flag.Usage()
42+
if flagSet.NArg() > 1 {
43+
flagSet.Usage()
4544
return errors.New("invalid number of arguments. Expected 1")
4645
}
4746

48-
return downloadPluginTasksFromRepo(flag.Arg(0))
47+
switch flagSet.Arg(0) {
48+
case "", "list":
49+
err := printPluginsHelp()
50+
if err != nil {
51+
return err
52+
}
53+
return nil
54+
default:
55+
return downloadPluginTasksFromRepo(flagSet.Arg(0))
56+
}
4957
}
5058

5159
func printPluginUsage() {
@@ -249,7 +257,7 @@ func newPlugins() (*plugins, error) {
249257
func (p *plugins) print() {
250258
if len(p.local) == 0 && len(p.ops) == 0 {
251259
debug("No plugins installed")
252-
// fmt.Println("No plugins installed. Use 'ops -plugin' to add new ones.")
260+
fmt.Println("No plugins installed. Use 'ops -plugin' to add new ones.")
253261
return
254262
}
255263

0 commit comments

Comments
 (0)