Skip to content

Commit 4372808

Browse files
tgsyscrusher
authored andcommitted
REDO: Remove leading path separator (:) from GOPATH
If TM_GOPATH was not set, the resulting GOPATH was starting with colon (i.e. ":$GOPATH"), which was causing troubles in go1.5 Reapply cherrypick of efa0658 from tg. Previously attempted in cf4a250, accidentally overwritten in 2653890. Issue identified by tg in #17.
1 parent 25ea2b5 commit 4372808

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Support/gomate.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
# TextMate's special GOPATH used in .tm_properties files prepended to the environment's GOPATH
1111
ENV['GOPATH'] = (ENV.has_key?('TM_GOPATH') ? ENV['TM_GOPATH'] : '') +
12-
(ENV.has_key?('GOPATH') ? ':' + ENV['GOPATH'] : '')
12+
(ENV.has_key?('GOPATH') ? ':' + ENV['GOPATH'] : '').sub(/^:+/,'')
1313

1414
# Call tool to determine gopath
1515
if ENV.has_key?('TM_GO_DYNAMIC_GOPATH')

0 commit comments

Comments
 (0)