Merge pull request #197 from magiconair/issue-195-mousetrap-win-only

Issue #195: Compile mousetrap only on Windows
This commit is contained in:
Eric Paris
2015-12-16 19:04:05 -05:00
4 changed files with 34 additions and 17 deletions

View File

@ -21,11 +21,8 @@ import (
"io"
"os"
"path/filepath"
"runtime"
"strings"
"time"
"github.com/inconshreveable/mousetrap"
flag "github.com/spf13/pflag"
)
@ -626,12 +623,9 @@ func (c *Command) ExecuteC() (cmd *Command, err error) {
return c.Root().ExecuteC()
}
if EnableWindowsMouseTrap && runtime.GOOS == "windows" {
if mousetrap.StartedByExplorer() {
c.Print(MousetrapHelpText)
time.Sleep(5 * time.Second)
os.Exit(1)
}
// windows hook
if preExecHookFn != nil {
preExecHookFn(c)
}
// initialize help as the last point possible to allow for user