Merge branch 'glide' of https://github.com/hinshun/fzf into hinshun-glide

.gitignore

@@ -1,7 +1,7 @@
 bin
 src/fzf/fzf-*
-gopath
 pkg
 Gemfile.lock
 .DS_Store
 doc/tags
+vendor

BUILD.md

@@ -10,8 +10,6 @@ Build instructions
 
 ### Using Makefile
 
-Makefile will set up and use its own `$GOPATH` under the project root.
-
 ```sh
 # Source files are located in src directory
 cd src

glide.lock

@@ -0,0 +1,38 @@
+hash: d68dd0bd779ac4ffca1e0c49ca38d85f90d5d68fa8e2d5d7db70a8ce8c662ec1
+updated: 2017-06-01T15:48:41.653745249-07:00
+imports:
+- name: github.com/gdamore/encoding
+  version: b23993cbb6353f0e6aa98d0ee318a34728f628b9
+- name: github.com/gdamore/tcell
+  version: 44772c121bb7838819d3ba4a7e84c0c2d617328e
+  subpackages:
+  - encoding
+- name: github.com/lucasb-eyer/go-colorful
+  version: c900de9dbbc73129068f5af6a823068fc5f2308c
+- name: github.com/mattn/go-isatty
+  version: 66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8
+- name: github.com/mattn/go-runewidth
+  version: 14207d285c6c197daabb5c9793d63e7af9ab2d50
+- name: github.com/mattn/go-shellwords
+  version: 02e3cf038dcea8290e44424da473dd12be796a8a
+- name: golang.org/x/crypto
+  version: e1a4589e7d3ea14a3352255d04b6f1a418845e5e
+  subpackages:
+  - ssh/terminal
+- name: golang.org/x/sys
+  version: b90f89a1e7a9c1f6b918820b3daa7f08488c8594
+  subpackages:
+  - unix
+- name: golang.org/x/text
+  version: 4ee4af566555f5fbe026368b75596286a312663a
+  subpackages:
+  - encoding
+  - encoding/charmap
+  - encoding/internal
+  - encoding/internal/identifier
+  - encoding/japanese
+  - encoding/korean
+  - encoding/simplifiedchinese
+  - encoding/traditionalchinese
+  - transform
+testImports: []

glide.yaml

@@ -0,0 +1,16 @@
+package: github.com/junegunn/fzf
+import:
+- package: github.com/mattn/go-isatty
+  version: 66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8
+- package: github.com/mattn/go-runewidth
+  version: 14207d285c6c197daabb5c9793d63e7af9ab2d50
+- package: github.com/mattn/go-shellwords
+  version: 02e3cf038dcea8290e44424da473dd12be796a8a
+- package: github.com/gdamore/tcell
+  version: 44772c121bb7838819d3ba4a7e84c0c2d617328e
+  subpackages:
+  - encoding
+- package: golang.org/x/crypto
+  version: e1a4589e7d3ea14a3352255d04b6f1a418845e5e
+  subpackages:
+  - ssh/terminal

src/Makefile

@@ -12,8 +12,6 @@ endif
 SOURCES     := $(wildcard *.go */*.go)
 ROOTDIR     := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 BINDIR      := $(shell dirname $(ROOTDIR))/bin
-GOPATH      := $(shell dirname $(ROOTDIR))/gopath
-SRCDIR      := $(GOPATH)/src/github.com/junegunn/fzf/src
 BINARY32    := fzf-$(GOOS)_386
 BINARY64    := fzf-$(GOOS)_amd64
 BINARYARM5  := fzf-$(GOOS)_arm5
@@ -27,7 +25,6 @@ RELEASEARM5 := fzf-$(VERSION)-$(GOOS)_arm5
 RELEASEARM6 := fzf-$(VERSION)-$(GOOS)_arm6
 RELEASEARM7 := fzf-$(VERSION)-$(GOOS)_arm7
 RELEASEARM8 := fzf-$(VERSION)-$(GOOS)_arm8
-export GOPATH
 
 # https://en.wikipedia.org/wiki/Uname
 UNAME_M := $(shell uname -m)
@@ -79,13 +76,8 @@ release-all: clean test
 	GOOS=openbsd make release
 	GOOS=windows make release
 
-$(SRCDIR):
+deps: $(SOURCES)
-	mkdir -p $(shell dirname $(SRCDIR))
+	cd .. && go get -u github.com/Masterminds/glide && $(GOPATH)/bin/glide install
-	ln -s $(ROOTDIR) $(SRCDIR)
-
-deps: $(SRCDIR) $(SOURCES)
-	cd $(SRCDIR) && go get -tags "$(TAGS)"
-	./deps
 
 test: deps
 	SHELL=/bin/sh GOOS= go test -v -tags "$(TAGS)" ./...

src/deps

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-if [ -z "$GOPATH" ]; then
-  echo '$GOPATH not defined'
-  exit 1
-fi
-
-reset() (
-  cd "$GOPATH/src/$1"
-  export GIT_DIR="$(pwd)/.git"
-  [ "$(git rev-parse HEAD)" = "$2" ] ||
-    (git fetch && git reset --hard "$2")
-)
-
-reset github.com/junegunn/go-isatty     66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8
-reset github.com/junegunn/go-runewidth  14207d285c6c197daabb5c9793d63e7af9ab2d50
-reset github.com/junegunn/go-shellwords 02e3cf038dcea8290e44424da473dd12be796a8a
-reset golang.org/x/crypto               abc5fa7ad02123a41f02bf1391c9760f7586e608

src/options.go

@@ -12,7 +12,7 @@ import (
 	"github.com/junegunn/fzf/src/tui"
 	"github.com/junegunn/fzf/src/util"
 
-	"github.com/junegunn/go-shellwords"
+	"github.com/mattn/go-shellwords"
 )
 
 const usage = `usage: fzf [options]

src/tui/tcell.go

@@ -8,11 +8,10 @@ import (
 
 	"runtime"
 
-	// https://github.com/gdamore/tcell/pull/135
+	"github.com/gdamore/tcell"
-	"github.com/junegunn/tcell"
+	"github.com/gdamore/tcell/encoding"
-	"github.com/junegunn/tcell/encoding"
 
-	"github.com/junegunn/go-runewidth"
+	"github.com/mattn/go-runewidth"
 )
 
 func HasFullscreenRenderer() bool {

src/util/util.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/junegunn/go-isatty"
+	"github.com/mattn/go-isatty"
-	"github.com/junegunn/go-runewidth"
+	"github.com/mattn/go-runewidth"
 )
 
 var _runeWidths = make(map[rune]int)

src/util/util_windows.go

@@ -7,7 +7,7 @@ import (
 	"os/exec"
 	"syscall"
 
-	"github.com/junegunn/go-shellwords"
+	"github.com/mattn/go-shellwords"
 )
 
 // ExecCommand executes the given command with $SHELL