GO15VENDOREXPERIMENT=1 (#430)

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "src/vendor/github.com/junegunn/go-shellwords"]
+	path = src/vendor/github.com/junegunn/go-shellwords
+	url = https://github.com/junegunn/go-shellwords.git
+[submodule "src/vendor/github.com/junegunn/go-runewidth"]
+	path = src/vendor/github.com/junegunn/go-runewidth
+	url = https://github.com/junegunn/go-runewidth.git

src/Dockerfile.centos

@@ -11,9 +11,16 @@ RUN cd / && curl \
     https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz | \
     tar -xz && mv go go1.4
 
+# Install Go 1.5
+RUN cd / && curl \
+    https://storage.googleapis.com/golang/go1.5.1.linux-amd64.tar.gz | \
+    tar -xz && mv go go1.5
+
+ENV GO15VENDOREXPERIMENT 1
+ENV GOROOT_BOOTSTRAP /go1.4
+ENV GOROOT /go1.5
 ENV GOPATH /go
-ENV GOROOT /go1.4
-ENV PATH /go1.4/bin:$PATH
+ENV PATH /go1.5/bin:$PATH
 
 # For i386 build
 RUN cd $GOROOT/src && GOARCH=386 ./make.bash

src/Makefile

@@ -41,8 +41,8 @@ android-build:
 	rm -f $(RELEASEARM7)
 
 test:
-	go get
-	go test -v ./...
+	GO15VENDOREXPERIMENT=1 go get
+	GO15VENDOREXPERIMENT=1 SHELL=/bin/sh go test -v ./...
 
 install: $(BINDIR)/fzf
 
@@ -53,10 +53,10 @@ clean:
 	cd fzf && rm -f fzf-*
 
 fzf/$(BINARY32): $(SOURCES)
-	cd fzf && GOARCH=386 CGO_ENABLED=1 go build -a -o $(BINARY32)
+	cd fzf && GO15VENDOREXPERIMENT=1 GOARCH=386 CGO_ENABLED=1 go build -a -o $(BINARY32)
 
 fzf/$(BINARY64): $(SOURCES)
-	cd fzf && go build -a -tags "$(TAGS)" -o $(BINARY64)
+	cd fzf && GO15VENDOREXPERIMENT=1 go build -a -tags "$(TAGS)" -o $(BINARY64)
 
 $(BINDIR)/fzf: fzf/$(BINARY64) | $(BINDIR)
 	cp -f fzf/$(BINARY64) $(BINDIR)

src/vendor/github.com/junegunn/go-runewidth

@@ -0,0 +1 @@
+Subproject commit 63c378b851290989b19ca955468386485f118c65

src/vendor/github.com/junegunn/go-shellwords

@@ -0,0 +1 @@
+Subproject commit 35d512af75e283aae4ca1fc3d44b159ed66189a4