env var for /dev in/out

cointop-sh · May 12, 2018 · 6e25a81 · 6e25a81
1 parent 48f0067
commit 6e25a81
Show file tree

Hide file tree

Showing 35 changed files with 27 additions and 14 deletions.
diff --git a/com.github.miguelmota.Cointop.json b/com.github.miguelmota.Cointop.json
@@ -14,7 +14,8 @@
       "sources": [
         {
           "type": "git",
-          "url": "https://github.com/miguelmota/cointop.git"
+          "url": "https://github.com/miguelmota/cointop.git",
+          "commit": "48f0067b8242ea60d5981152977c381a2aa13c6e"
         }
       ]
     }

diff --git a/pkg/gocui/attribute.go b/pkg/gocui/attribute.go
@@ -4,7 +4,7 @@
 
 package gocui
 
-import "github.com/nsf/termbox-go"
+import "github.com/miguelmota/cointop/pkg/termbox"
 
 // Attribute represents a terminal attribute, like color, font style, etc. They
 // can be combined using bitwise OR (|). Note that it is not possible to

diff --git a/pkg/gocui/gocui.go b/pkg/gocui/gocui.go
@@ -7,7 +7,7 @@ package gocui
 import (
 	"errors"
 
-	"github.com/nsf/termbox-go"
+	"github.com/miguelmota/cointop/pkg/termbox"
 )
 
 var (

diff --git a/pkg/gocui/keybinding.go b/pkg/gocui/keybinding.go
@@ -4,7 +4,7 @@
 
 package gocui
 
-import "github.com/nsf/termbox-go"
+import "github.com/miguelmota/cointop/pkg/termbox"
 
 // Keybidings are used to link a given key-press event with a handler.
 type keybinding struct {

diff --git a/pkg/gocui/view.go b/pkg/gocui/view.go
@@ -10,7 +10,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/nsf/termbox-go"
+	"github.com/miguelmota/cointop/pkg/termbox"
 )
 
 // A View is a window. It maintains its own internal buffer and cursor

diff --git a/vendor/github.com/nsf/termbox-go/AUTHORS → pkg/termbox/AUTHORS b/vendor/github.com/nsf/termbox-go/AUTHORS → pkg/termbox/AUTHORS
diff --git a/vendor/github.com/nsf/termbox-go/LICENSE → pkg/termbox/LICENSE b/vendor/github.com/nsf/termbox-go/LICENSE → pkg/termbox/LICENSE
diff --git a/vendor/github.com/nsf/termbox-go/README.md → pkg/termbox/README.md b/vendor/github.com/nsf/termbox-go/README.md → pkg/termbox/README.md
diff --git a/...thub.com/nsf/termbox-go/_demos/editbox.go → pkg/termbox/_demos/editbox.go b/...thub.com/nsf/termbox-go/_demos/editbox.go → pkg/termbox/_demos/editbox.go
diff --git a/...ub.com/nsf/termbox-go/_demos/interrupt.go → pkg/termbox/_demos/interrupt.go b/...ub.com/nsf/termbox-go/_demos/interrupt.go → pkg/termbox/_demos/interrupt.go
diff --git a/...hub.com/nsf/termbox-go/_demos/keyboard.go → pkg/termbox/_demos/keyboard.go b/...hub.com/nsf/termbox-go/_demos/keyboard.go → pkg/termbox/_demos/keyboard.go
diff --git a/...ithub.com/nsf/termbox-go/_demos/output.go → pkg/termbox/_demos/output.go b/...ithub.com/nsf/termbox-go/_demos/output.go → pkg/termbox/_demos/output.go
diff --git a/...github.com/nsf/termbox-go/_demos/paint.go → pkg/termbox/_demos/paint.go b/...github.com/nsf/termbox-go/_demos/paint.go → pkg/termbox/_demos/paint.go
diff --git a/...om/nsf/termbox-go/_demos/random_output.go → pkg/termbox/_demos/random_output.go b/...om/nsf/termbox-go/_demos/random_output.go → pkg/termbox/_demos/random_output.go
diff --git a/...ub.com/nsf/termbox-go/_demos/raw_input.go → pkg/termbox/_demos/raw_input.go b/...ub.com/nsf/termbox-go/_demos/raw_input.go → pkg/termbox/_demos/raw_input.go
diff --git a/vendor/github.com/nsf/termbox-go/api.go → pkg/termbox/api.go b/vendor/github.com/nsf/termbox-go/api.go → pkg/termbox/api.go
@@ -2,13 +2,16 @@
 
 package termbox
 
-import "github.com/mattn/go-runewidth"
-import "fmt"
-import "os"
-import "os/signal"
-import "syscall"
-import "runtime"
-import "time"
+import (
+	"fmt"
+	"os"
+	"os/signal"
+	"runtime"
+	"syscall"
+	"time"
+
+	"github.com/mattn/go-runewidth"
+)
 
 // public API
 
@@ -24,11 +27,20 @@ import "time"
 func Init() error {
 	var err error
 
-	out, err = os.OpenFile("/dev/tty", syscall.O_WRONLY, 0)
+	devin := os.Getenv("DEV_IN")
+	if devin == "" {
+		devin = "/dev/tty"
+	}
+	devout := os.Getenv("DEV_OUT")
+	if devout == "" {
+		devout = "/dev/tty"
+	}
+
+	out, err = os.OpenFile(devin, syscall.O_WRONLY, 0)
 	if err != nil {
 		return err
 	}
-	in, err = syscall.Open("/dev/tty", syscall.O_RDONLY, 0)
+	in, err = syscall.Open(devout, syscall.O_RDONLY, 0)
 	if err != nil {
 		return err
 	}

diff --git a/...r/github.com/nsf/termbox-go/api_common.go → pkg/termbox/api_common.go b/...r/github.com/nsf/termbox-go/api_common.go → pkg/termbox/api_common.go
diff --git a/.../github.com/nsf/termbox-go/api_windows.go → pkg/termbox/api_windows.go b/.../github.com/nsf/termbox-go/api_windows.go → pkg/termbox/api_windows.go
diff --git a/...ub.com/nsf/termbox-go/collect_terminfo.py → pkg/termbox/collect_terminfo.py b/...ub.com/nsf/termbox-go/collect_terminfo.py → pkg/termbox/collect_terminfo.py
diff --git a/vendor/github.com/nsf/termbox-go/escwait.go → pkg/termbox/escwait.go b/vendor/github.com/nsf/termbox-go/escwait.go → pkg/termbox/escwait.go
diff --git a/...thub.com/nsf/termbox-go/escwait_darwin.go → pkg/termbox/escwait_darwin.go b/...thub.com/nsf/termbox-go/escwait_darwin.go → pkg/termbox/escwait_darwin.go
diff --git a/vendor/github.com/nsf/termbox-go/syscalls.go → pkg/termbox/syscalls.go b/vendor/github.com/nsf/termbox-go/syscalls.go → pkg/termbox/syscalls.go
diff --git a/...hub.com/nsf/termbox-go/syscalls_darwin.go → pkg/termbox/syscalls_darwin.go b/...hub.com/nsf/termbox-go/syscalls_darwin.go → pkg/termbox/syscalls_darwin.go
diff --git a/...m/nsf/termbox-go/syscalls_darwin_amd64.go → pkg/termbox/syscalls_darwin_amd64.go b/...m/nsf/termbox-go/syscalls_darwin_amd64.go → pkg/termbox/syscalls_darwin_amd64.go
diff --git a/....com/nsf/termbox-go/syscalls_dragonfly.go → pkg/termbox/syscalls_dragonfly.go b/....com/nsf/termbox-go/syscalls_dragonfly.go → pkg/termbox/syscalls_dragonfly.go
diff --git a/...ub.com/nsf/termbox-go/syscalls_freebsd.go → pkg/termbox/syscalls_freebsd.go b/...ub.com/nsf/termbox-go/syscalls_freebsd.go → pkg/termbox/syscalls_freebsd.go
diff --git a/...thub.com/nsf/termbox-go/syscalls_linux.go → pkg/termbox/syscalls_linux.go b/...thub.com/nsf/termbox-go/syscalls_linux.go → pkg/termbox/syscalls_linux.go
diff --git a/...hub.com/nsf/termbox-go/syscalls_netbsd.go → pkg/termbox/syscalls_netbsd.go b/...hub.com/nsf/termbox-go/syscalls_netbsd.go → pkg/termbox/syscalls_netbsd.go
diff --git a/...ub.com/nsf/termbox-go/syscalls_openbsd.go → pkg/termbox/syscalls_openbsd.go b/...ub.com/nsf/termbox-go/syscalls_openbsd.go → pkg/termbox/syscalls_openbsd.go
diff --git a/...ub.com/nsf/termbox-go/syscalls_windows.go → pkg/termbox/syscalls_windows.go b/...ub.com/nsf/termbox-go/syscalls_windows.go → pkg/termbox/syscalls_windows.go
diff --git a/vendor/github.com/nsf/termbox-go/termbox.go → pkg/termbox/termbox.go b/vendor/github.com/nsf/termbox-go/termbox.go → pkg/termbox/termbox.go
diff --git a/...thub.com/nsf/termbox-go/termbox_common.go → pkg/termbox/termbox_common.go b/...thub.com/nsf/termbox-go/termbox_common.go → pkg/termbox/termbox_common.go
diff --git a/...hub.com/nsf/termbox-go/termbox_windows.go → pkg/termbox/termbox_windows.go b/...hub.com/nsf/termbox-go/termbox_windows.go → pkg/termbox/termbox_windows.go
diff --git a/vendor/github.com/nsf/termbox-go/terminfo.go → pkg/termbox/terminfo.go b/vendor/github.com/nsf/termbox-go/terminfo.go → pkg/termbox/terminfo.go
diff --git a/...ub.com/nsf/termbox-go/terminfo_builtin.go → pkg/termbox/terminfo_builtin.go b/...ub.com/nsf/termbox-go/terminfo_builtin.go → pkg/termbox/terminfo_builtin.go