mirror of
https://github.com/charmbracelet/glow.git
synced 2026-08-20 15:14:17 +02:00
Merge 1a9d811e9c into e5cb757278
This commit is contained in:
commit
39e1291a3c
1 changed files with 13 additions and 0 deletions
13
main.go
13
main.go
|
|
@ -179,7 +179,16 @@ func validateOptions(cmd *cobra.Command) error {
|
|||
}
|
||||
|
||||
// validate the glamour style
|
||||
// via cfg, mirroring the TUI path
|
||||
cfg, err := env.ParseAs[ui.Config]()
|
||||
if err != nil {
|
||||
return fmt.Errorf("error parsing config: %v", err)
|
||||
}
|
||||
|
||||
style = viper.GetString("style")
|
||||
if cfg.GlamourStyle != "" {
|
||||
style = cfg.GlamourStyle
|
||||
}
|
||||
if err := validateStyle(style); err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -191,6 +200,10 @@ func validateOptions(cmd *cobra.Command) error {
|
|||
style = "notty"
|
||||
}
|
||||
|
||||
if cfg.GlamourMaxWidth != 0 {
|
||||
width = cfg.GlamourMaxWidth
|
||||
}
|
||||
|
||||
// Detect terminal width
|
||||
if !cmd.Flags().Changed("width") { //nolint:nestif
|
||||
if isTerminal && width == 0 {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue