Merge pull request #2 from essentialkaos/develop

Version 0.0.2

Author: andyone

go.mod

@@ -3,3 +3,5 @@ module github.com/essentialkaos/rds-cli-completion-generator
 go 1.22.8
 
 require github.com/essentialkaos/ek/v13 v13.15.9
+
+require golang.org/x/sys v0.29.0 // indirect

go.sum

@@ -8,3 +8,5 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

rds-cli-completion-generator.go

@@ -11,6 +11,7 @@ import (
 	"fmt"
 	"os"
 	"sort"
+	"strconv"
 	"strings"
 
 	"github.com/essentialkaos/ek/v13/fmtc"
@@ -34,7 +35,7 @@ import (
 // Basic utility info
 const (
 	APP  = "rds-cli-completion-generator"
-	VER  = "0.0.1"
+	VER  = "0.0.2"
 	DESC = "Tool to generate completion for RDS CLI"
 )
 
@@ -220,10 +221,10 @@ func printCommandsCode(commands InfoSlice) {
 	fmtc.NewLine()
 	for _, c := range commands {
 		if len(c.Arguments) == 0 {
-			fmtc.Printfn(`  { {y}"%s"{!}, nil },`, c.Name)
+			fmtc.Printfn(`  { {y}"%s"{!}, {*}nil{!}, {*}false{!} },`, c.Name)
 		} else {
 			fmtc.Printfn(
-				"  { {y}\"%s\"{!}, {*}[]string{!}{"+formatArgumentsSlice(c.Arguments)+"} },",
+				"  { {y}\"%s\"{!}, {*}[]string{!}{"+formatArgumentsSlice(c.Arguments)+"}, {*}false{!} },",
 				c.Name,
 			)
 		}
@@ -236,7 +237,7 @@ func formatArgumentsSlice(args []string) string {
 	var result []string
 
 	for _, a := range args {
-		result = append(result, fmt.Sprintf("{y}\"%s\"{!}", a))
+		result = append(result, fmt.Sprintf("{y}%s{!}", strconv.Quote(a)))
 	}
 
 	return strings.Join(result, ", ")