Skip to content

Commit ae5a673

Browse files
committed
Revert "Merge branch 'dev'"
This reverts commit 0e8731f, reversing changes made to a4a0d55.
1 parent 0e8731f commit ae5a673

File tree

1 file changed

+3
-13
lines changed

1 file changed

+3
-13
lines changed

main.go

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"strings"
1313

1414
"github.com/alecthomas/kong"
15-
"github.com/fatih/color"
1615
"github.com/zk-org/zk/internal/cli"
1716
"github.com/zk-org/zk/internal/cli/cmd"
1817
"github.com/zk-org/zk/internal/core"
@@ -31,10 +30,9 @@ var root struct {
3130
Edit cmd.Edit `cmd group:"notes" help:"Edit notes matching the given criteria."`
3231
Tag cmd.Tag `cmd group:"notes" help:"Manage the note tags."`
3332

34-
NotebookDir string `type:path placeholder:PATH help:"Turn off notebook auto-discovery and set manually the notebook where commands are run."`
35-
WorkingDir string `short:W type:path placeholder:PATH help:"Run as if zk was started in <PATH> instead of the current working directory."`
36-
NoInput NoInput `help:"Never prompt or ask for confirmation."`
37-
Color ForceColor `help:"Force colored output"`
33+
NotebookDir string `type:path placeholder:PATH help:"Turn off notebook auto-discovery and set manually the notebook where commands are run."`
34+
WorkingDir string `short:W type:path placeholder:PATH help:"Run as if zk was started in <PATH> instead of the current working directory."`
35+
NoInput NoInput `help:"Never prompt or ask for confirmation."`
3836
// ForceInput is a debugging flag overriding the default value of interaction prompts.
3937
ForceInput string `hidden xor:"input"`
4038
Debug bool `default:"0" hidden help:"Print a debug stacktrace on SIGINT."`
@@ -53,14 +51,6 @@ func (f NoInput) BeforeApply(container *cli.Container) error {
5351
return nil
5452
}
5553

56-
// When enabled, output colored text even if stdout is not a tty.
57-
type ForceColor bool
58-
59-
func (c ForceColor) BeforeApply() error {
60-
color.NoColor = false
61-
return nil
62-
}
63-
6454
// ShowHelp is the default command run. It's equivalent to `zk --help`.
6555
type ShowHelp struct{}
6656

0 commit comments

Comments
 (0)