Skip to content

Commit

Permalink
Merge branch 'master' of github.com:AlanQuatermain/go-tmbundle
Browse files Browse the repository at this point in the history
* 'master' of github.com:AlanQuatermain/go-tmbundle:
  Use GOBIN shell variable instead of PATH if present
  Fix for source filenames with spaces bug.
  revert goroot
  fixed issue #6
  • Loading branch information
Jim Dovey committed Nov 22, 2011
2 parents 54628bd + 69aed9f commit 05c2fe8
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Commands/Complete.tmCommand
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ document = STDIN.readlines
# byte offset of cursor position from the beginning of file
cursor = document[ 0, ENV['TM_LINE_NUMBER'].to_i - 1].join().length + ENV['TM_LINE_INDEX'].to_i
output = IO.popen("gocode -f=csv autocomplete #{ENV['TM_FILEPATH']} #{cursor}", "w+") do |pipe|
output = IO.popen("gocode -f=csv autocomplete #{cursor}", "w+") do |pipe|
pipe.puts document.join()
pipe.close_write
pipe.read
Expand Down
20 changes: 12 additions & 8 deletions Support/bin/gobin
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,19 @@

. goarch

if test -n "$GOBIN"; then
GOPREFIX=${GOBIN}/
fi

O=`go_arch_identifier $GOARCH`
AS=${O}a
CC=${O}c
GC=${O}g
LD=${O}l
NM=${O}nm
AR=gopack
MK=gomake
GT=gotest
AS=${GOPREFIX}${O}a
CC=${GOPREFIX}${O}c
GC=${GOPREFIX}${O}g
LD=${GOPREFIX}${O}l
NM=${GOPREFIX}${O}nm
AR=${GOPREFIX}gopack
MK=${GOPREFIX}gomake
GT=${GOPREFIX}gotest

require_cmd "$GC"

Expand Down

0 comments on commit 05c2fe8

Please sign in to comment.