From ca0b3b6fd7517aaedcb7517804e2040a8a7aad95 Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Sat, 3 Jun 2017 19:47:53 +0900 Subject: Fixes for Cygwin - Update install script to download Windows binary if $TERM == cygwin - Unset TERM if $TERM == cygwin (#933) - Always use cmd.exe instead of $SHELL when running commands --- src/tui/tcell.go | 4 ++++ src/util/util_windows.go | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/tui/tcell.go b/src/tui/tcell.go index e66ed2f0..0c80de2b 100644 --- a/src/tui/tcell.go +++ b/src/tui/tcell.go @@ -3,6 +3,7 @@ package tui import ( + "os" "time" "unicode/utf8" @@ -140,6 +141,9 @@ func (r *FullscreenRenderer) initScreen() { } func (r *FullscreenRenderer) Init() { + if os.Getenv("TERM") == "cygwin" { + os.Setenv("TERM", "") + } encoding.Register() r.initScreen() diff --git a/src/util/util_windows.go b/src/util/util_windows.go index 1bf8f7aa..efd19a2a 100644 --- a/src/util/util_windows.go +++ b/src/util/util_windows.go @@ -12,15 +12,11 @@ import ( // ExecCommand executes the given command with $SHELL func ExecCommand(command string) *exec.Cmd { - shell := os.Getenv("SHELL") - if len(shell) == 0 { - shell = "cmd" - } args, _ := shellwords.Parse(command) allArgs := make([]string, len(args)+1) allArgs[0] = "/c" copy(allArgs[1:], args) - return exec.Command(shell, allArgs...) + return exec.Command("cmd", allArgs...) } // IsWindows returns true on Windows -- cgit v1.2.3