new: implemented events.stream.output (closes #169). new: implemented -no-colors argument.

This commit is contained in:
evilsocket 2018-03-13 13:20:21 +01:00
commit e40219976c
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
9 changed files with 97 additions and 56 deletions

View file

@ -7,6 +7,7 @@ type Options struct {
Caplet *string
Debug *bool
Silent *bool
NoColors *bool
NoHistory *bool
EnvFile *string
Commands *string
@ -20,6 +21,7 @@ func ParseOptions() (Options, error) {
Caplet: flag.String("caplet", "", "Read commands from this file and execute them in the interactive session."),
Debug: flag.Bool("debug", false, "Print debug messages."),
Silent: flag.Bool("silent", false, "Suppress all logs which are not errors."),
NoColors: flag.Bool("no-colors", false, "Disable output color effect,s."),
NoHistory: flag.Bool("no-history", false, "Disable interactive session history file."),
EnvFile: flag.String("env-file", "", "Load environment variables from this file if found, set to empty to disable environment persistance."),
Commands: flag.String("eval", "", "Run one or more commands separated by ; in the interactive session, used to set variables via command line."),

View file

@ -26,14 +26,17 @@ var (
RESET = "\033[0m"
NoColors = false
HasColors = true
)
func init() {
NoColors = os.Getenv("TERM") == "dumb" ||
func isDumbTerminal() bool {
return os.Getenv("TERM") == "dumb" ||
os.Getenv("TERM") == "" ||
(!isatty.IsTerminal(os.Stdout.Fd()) && !isatty.IsCygwinTerminal(os.Stdout.Fd()))
if NoColors {
}
func InitSwag(disableColors bool) {
if disableColors || isDumbTerminal() {
BOLD = ""
DIM = ""
RED = ""
@ -48,6 +51,7 @@ func init() {
BG_YELLOW = ""
BG_LBLUE = ""
RESET = ""
HasColors = false
}
}