Skip to content

Commit

Permalink
Merge pull request #2 from spiegel-im-spiegel/change-terminal
Browse files Browse the repository at this point in the history
change terminal package
  • Loading branch information
spiegel-im-spiegel authored Nov 8, 2017
2 parents 5eb36b6 + f45997a commit 792f97f
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 13 deletions.
16 changes: 8 additions & 8 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ ignored = [
version = "^1.1.0"

[[constraint]]
name = "golang.org/x/crypto"
branch = "master"
name = "github.com/mattn/go-isatty"
version = "~0.0.3"

[[constraint]]
name = "github.com/atotto/clipboard"
Expand Down
5 changes: 2 additions & 3 deletions cli/mklink/facade/facade.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@ import (
"io"
"os"
"runtime"
"syscall"

isatty "github.com/mattn/go-isatty"
"github.com/spf13/cobra"
"github.com/spiegel-im-spiegel/gocli"
"github.com/spiegel-im-spiegel/mklink"
"github.com/spiegel-im-spiegel/mklink/cli/mklink/interactive"
"github.com/spiegel-im-spiegel/mklink/cli/mklink/makelink"
"golang.org/x/crypto/ssh/terminal"
)

var (
Expand Down Expand Up @@ -75,7 +74,7 @@ var rootCmd = &cobra.Command{
return err
}
}
} else if terminal.IsTerminal(int(syscall.Stdin)) {
} else if isatty.IsTerminal(os.Stdin.Fd()) {
if interactiveFlag {
interactive.New(style, log).Run()
}
Expand Down
Binary file modified dependency.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 792f97f

Please sign in to comment.