diff --git a/com.github.miguelmota.Cointop.json b/com.github.miguelmota.Cointop.json index a0d846f..9256c11 100644 --- 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 index bad758a..efcda08 100644 --- 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 index 9499d3c..6df837c 100644 --- 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 index 03fe677..5d504cc 100644 --- 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 index 42082f8..f7080f5 100644 --- 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 b/pkg/termbox/AUTHORS similarity index 100% rename from vendor/github.com/nsf/termbox-go/AUTHORS rename to pkg/termbox/AUTHORS diff --git a/vendor/github.com/nsf/termbox-go/LICENSE b/pkg/termbox/LICENSE similarity index 100% rename from vendor/github.com/nsf/termbox-go/LICENSE rename to pkg/termbox/LICENSE diff --git a/vendor/github.com/nsf/termbox-go/README.md b/pkg/termbox/README.md similarity index 100% rename from vendor/github.com/nsf/termbox-go/README.md rename to pkg/termbox/README.md diff --git a/vendor/github.com/nsf/termbox-go/_demos/editbox.go b/pkg/termbox/_demos/editbox.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/_demos/editbox.go rename to pkg/termbox/_demos/editbox.go diff --git a/vendor/github.com/nsf/termbox-go/_demos/interrupt.go b/pkg/termbox/_demos/interrupt.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/_demos/interrupt.go rename to pkg/termbox/_demos/interrupt.go diff --git a/vendor/github.com/nsf/termbox-go/_demos/keyboard.go b/pkg/termbox/_demos/keyboard.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/_demos/keyboard.go rename to pkg/termbox/_demos/keyboard.go diff --git a/vendor/github.com/nsf/termbox-go/_demos/output.go b/pkg/termbox/_demos/output.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/_demos/output.go rename to pkg/termbox/_demos/output.go diff --git a/vendor/github.com/nsf/termbox-go/_demos/paint.go b/pkg/termbox/_demos/paint.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/_demos/paint.go rename to pkg/termbox/_demos/paint.go diff --git a/vendor/github.com/nsf/termbox-go/_demos/random_output.go b/pkg/termbox/_demos/random_output.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/_demos/random_output.go rename to pkg/termbox/_demos/random_output.go diff --git a/vendor/github.com/nsf/termbox-go/_demos/raw_input.go b/pkg/termbox/_demos/raw_input.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/_demos/raw_input.go rename to pkg/termbox/_demos/raw_input.go diff --git a/vendor/github.com/nsf/termbox-go/api.go b/pkg/termbox/api.go similarity index 97% rename from vendor/github.com/nsf/termbox-go/api.go rename to pkg/termbox/api.go index d530ab5..e5b9344 100644 --- a/vendor/github.com/nsf/termbox-go/api.go +++ b/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/vendor/github.com/nsf/termbox-go/api_common.go b/pkg/termbox/api_common.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/api_common.go rename to pkg/termbox/api_common.go diff --git a/vendor/github.com/nsf/termbox-go/api_windows.go b/pkg/termbox/api_windows.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/api_windows.go rename to pkg/termbox/api_windows.go diff --git a/vendor/github.com/nsf/termbox-go/collect_terminfo.py b/pkg/termbox/collect_terminfo.py similarity index 100% rename from vendor/github.com/nsf/termbox-go/collect_terminfo.py rename to pkg/termbox/collect_terminfo.py diff --git a/vendor/github.com/nsf/termbox-go/escwait.go b/pkg/termbox/escwait.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/escwait.go rename to pkg/termbox/escwait.go diff --git a/vendor/github.com/nsf/termbox-go/escwait_darwin.go b/pkg/termbox/escwait_darwin.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/escwait_darwin.go rename to pkg/termbox/escwait_darwin.go diff --git a/vendor/github.com/nsf/termbox-go/syscalls.go b/pkg/termbox/syscalls.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/syscalls.go rename to pkg/termbox/syscalls.go diff --git a/vendor/github.com/nsf/termbox-go/syscalls_darwin.go b/pkg/termbox/syscalls_darwin.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/syscalls_darwin.go rename to pkg/termbox/syscalls_darwin.go diff --git a/vendor/github.com/nsf/termbox-go/syscalls_darwin_amd64.go b/pkg/termbox/syscalls_darwin_amd64.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/syscalls_darwin_amd64.go rename to pkg/termbox/syscalls_darwin_amd64.go diff --git a/vendor/github.com/nsf/termbox-go/syscalls_dragonfly.go b/pkg/termbox/syscalls_dragonfly.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/syscalls_dragonfly.go rename to pkg/termbox/syscalls_dragonfly.go diff --git a/vendor/github.com/nsf/termbox-go/syscalls_freebsd.go b/pkg/termbox/syscalls_freebsd.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/syscalls_freebsd.go rename to pkg/termbox/syscalls_freebsd.go diff --git a/vendor/github.com/nsf/termbox-go/syscalls_linux.go b/pkg/termbox/syscalls_linux.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/syscalls_linux.go rename to pkg/termbox/syscalls_linux.go diff --git a/vendor/github.com/nsf/termbox-go/syscalls_netbsd.go b/pkg/termbox/syscalls_netbsd.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/syscalls_netbsd.go rename to pkg/termbox/syscalls_netbsd.go diff --git a/vendor/github.com/nsf/termbox-go/syscalls_openbsd.go b/pkg/termbox/syscalls_openbsd.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/syscalls_openbsd.go rename to pkg/termbox/syscalls_openbsd.go diff --git a/vendor/github.com/nsf/termbox-go/syscalls_windows.go b/pkg/termbox/syscalls_windows.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/syscalls_windows.go rename to pkg/termbox/syscalls_windows.go diff --git a/vendor/github.com/nsf/termbox-go/termbox.go b/pkg/termbox/termbox.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/termbox.go rename to pkg/termbox/termbox.go diff --git a/vendor/github.com/nsf/termbox-go/termbox_common.go b/pkg/termbox/termbox_common.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/termbox_common.go rename to pkg/termbox/termbox_common.go diff --git a/vendor/github.com/nsf/termbox-go/termbox_windows.go b/pkg/termbox/termbox_windows.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/termbox_windows.go rename to pkg/termbox/termbox_windows.go diff --git a/vendor/github.com/nsf/termbox-go/terminfo.go b/pkg/termbox/terminfo.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/terminfo.go rename to pkg/termbox/terminfo.go diff --git a/vendor/github.com/nsf/termbox-go/terminfo_builtin.go b/pkg/termbox/terminfo_builtin.go similarity index 100% rename from vendor/github.com/nsf/termbox-go/terminfo_builtin.go rename to pkg/termbox/terminfo_builtin.go