Skip to content
This repository has been archived by the owner on Aug 30, 2024. It is now read-only.

fix raw keywords print #5

Merged
merged 1 commit into from
Mar 17, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func main() {
fmt.Println("version:", version)
return
}
if !(len(os.Args) > 1) || flags.Help {
if flags.Help || len(os.Args) == 0 {
getopt.Usage()
return
}
Expand Down Expand Up @@ -60,7 +60,7 @@ func main() {
return
}
if flags.Raw {
fmt.Println(fmt.Sprintf("%+v", binds))
fmt.Printf("%+v\n", binds)
if flags.Output != "" {
err := os.WriteFile(flags.Output, []byte(fmt.Sprintf("%+v", binds)), 0o644)
if err != nil {
Expand Down Expand Up @@ -105,7 +105,7 @@ func outputData(configValues *reader.ConfigValues, flags *flags.Flags) error {
if flags.Json {
return jsonHandler(configValues, flags)
}
return fmt.Errorf("No output flag selected")
return fmt.Errorf("no output flag selected")
}

func filterBinds(configValues *reader.ConfigValues, flags *flags.Flags) []*reader.Keybind {
Expand Down Expand Up @@ -206,6 +206,11 @@ func rawHandler(configValues *reader.ConfigValues, flags *flags.Flags) error {
out += fmt.Sprintf("%s=%s\n", val.ExecType, val.Command)
}
}
if flags.Keywords {
for _, key := range configValues.Keywords {
out += fmt.Sprintf("$%s = %s\n", key.Name, key.Value)
}
}
if flags.Binds {
for _, bind := range configValues.Binds {
out += fmt.Sprintf("%s = %s %s %s", bind.BindType, bind.Bind, bind.Dispatcher, bind.Command)
Expand All @@ -215,9 +220,6 @@ func rawHandler(configValues *reader.ConfigValues, flags *flags.Flags) error {
}
}
out += "\n"
for _, key := range configValues.Keywords {
out += fmt.Sprintf("$%s = %s\n", key.Name, key.Value)
}
}
}
fmt.Print(out)
Expand Down