From 766d634fbbc009b0df145a26c109abcba8d29f01 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Mon, 10 Feb 2014 22:48:12 +0400 Subject: [PATCH] terminal.IsTerminal() is not available on FreeBSD until go1.3 --- utils/progress.go | 4 +--- utils/terminal.go | 12 ++++++++++++ utils/terminal_bsd.go | 7 +++++++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 utils/terminal.go create mode 100644 utils/terminal_bsd.go diff --git a/utils/progress.go b/utils/progress.go index 1365e092..f95de8dd 100644 --- a/utils/progress.go +++ b/utils/progress.go @@ -1,10 +1,8 @@ package utils import ( - "code.google.com/p/go.crypto/ssh/terminal" "fmt" "github.com/cheggaaa/pb" - "syscall" ) const ( @@ -54,7 +52,7 @@ func (p *Progress) InitBar(count int64, isBytes bool) { if p.bar != nil { panic("bar already initialized") } - if terminal.IsTerminal(syscall.Stdout) { + if RunningOnTerminal() { p.bar = pb.New(0) p.bar.Total = count p.bar.NotPrint = true diff --git a/utils/terminal.go b/utils/terminal.go new file mode 100644 index 00000000..e9d5a923 --- /dev/null +++ b/utils/terminal.go @@ -0,0 +1,12 @@ +// +build !freebsd + +package utils + +import ( + "code.google.com/p/go.crypto/ssh/terminal" + "syscall" +) + +func RunningOnTerminal() bool { + return terminal.IsTerminal(syscall.Stdout) +} diff --git a/utils/terminal_bsd.go b/utils/terminal_bsd.go new file mode 100644 index 00000000..0d89e5fe --- /dev/null +++ b/utils/terminal_bsd.go @@ -0,0 +1,7 @@ +// +build freebsd + +package utils + +func RunningOnTerminal() bool { + return false +}