From d44a0121b48dcee00b1fff7256c443ef6fbe9598 Mon Sep 17 00:00:00 2001 From: Michael Sheets Date: Tue, 5 Nov 2013 16:42:56 -0600 Subject: [PATCH 1/2] Use version 1.8 of ruby for bundle items 10.7 and 10.8 only include ruby 1.8, so all bundle items have been written to work with that. Optionally supporting ruby 1.9 and 2.0 is problematic as these versions are not fully backwards compatible. Fixes #43. --- Commands/Compile.tmCommand | 2 +- Commands/Complete.tmCommand | 2 +- Commands/Documentation for Word : Selection.tmCommand | 2 +- Commands/Reformat Document.tmCommand | 2 +- Commands/Run.tmCommand | 2 +- Commands/Test.tmCommand | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Commands/Compile.tmCommand b/Commands/Compile.tmCommand index 970fff1..a1f637a 100644 --- a/Commands/Compile.tmCommand +++ b/Commands/Compile.tmCommand @@ -7,7 +7,7 @@ beforeRunningCommand saveModifiedFiles command - #!/usr/bin/env ruby + #!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby require "#{ENV['TM_BUNDLE_SUPPORT']}/gomate" Go::go "build", :verb => "Compiling" diff --git a/Commands/Complete.tmCommand b/Commands/Complete.tmCommand index 9a9aa72..778fdff 100644 --- a/Commands/Complete.tmCommand +++ b/Commands/Complete.tmCommand @@ -5,7 +5,7 @@ beforeRunningCommand saveActiveFile command - #!/usr/bin/env ruby -Ku + #!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -Ku require ENV['TM_SUPPORT_PATH'] + '/lib/ui.rb' require ENV['TM_SUPPORT_PATH'] + "/lib/escape.rb" require ENV['TM_SUPPORT_PATH'] + "/lib/tm/require_cmd.rb" diff --git a/Commands/Documentation for Word : Selection.tmCommand b/Commands/Documentation for Word : Selection.tmCommand index d835f68..a1fc0da 100644 --- a/Commands/Documentation for Word : Selection.tmCommand +++ b/Commands/Documentation for Word : Selection.tmCommand @@ -5,7 +5,7 @@ beforeRunningCommand saveModifiedFiles command - #!/usr/bin/env ruby + #!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby require "#{ENV['TM_BUNDLE_SUPPORT']}/gomate" Go::godoc diff --git a/Commands/Reformat Document.tmCommand b/Commands/Reformat Document.tmCommand index 6229c9a..1c35202 100644 --- a/Commands/Reformat Document.tmCommand +++ b/Commands/Reformat Document.tmCommand @@ -5,7 +5,7 @@ beforeRunningCommand saveModifiedFiles command - #!/usr/bin/env ruby + #!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby require "#{ENV['TM_BUNDLE_SUPPORT']}/gomate" Go::gofmt diff --git a/Commands/Run.tmCommand b/Commands/Run.tmCommand index ae257b7..a609422 100644 --- a/Commands/Run.tmCommand +++ b/Commands/Run.tmCommand @@ -7,7 +7,7 @@ beforeRunningCommand saveModifiedFiles command - #!/usr/bin/env ruby + #!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby require "#{ENV['TM_BUNDLE_SUPPORT']}/gomate" Go::go "run", :verb => "Running" diff --git a/Commands/Test.tmCommand b/Commands/Test.tmCommand index c5be8aa..35458ea 100644 --- a/Commands/Test.tmCommand +++ b/Commands/Test.tmCommand @@ -7,7 +7,7 @@ beforeRunningCommand saveModifiedFiles command - #!/usr/bin/env ruby + #!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby require "#{ENV['TM_BUNDLE_SUPPORT']}/gomate" Go::go "test", :verb => "Testing" From 611593950e0e611101dbc899c27fd51b6552991f Mon Sep 17 00:00:00 2001 From: Michael Sheets Date: Fri, 27 Dec 2013 04:35:50 -0600 Subject: [PATCH 2/2] Use version 1.8 of ruby for bundle items 10.7 and 10.8 only include ruby 1.8, so all bundle items have been written to work with that. Optionally supporting ruby 1.9 and 2.0 is problematic as these versions are not fully backwards compatible. #ignore --- Support/gomate.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Support/gomate.rb b/Support/gomate.rb index 6c2b5a2..42f28f6 100755 --- a/Support/gomate.rb +++ b/Support/gomate.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby +#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby require "#{ENV['TM_SUPPORT_PATH']}/lib/escape" require "#{ENV['TM_SUPPORT_PATH']}/lib/exit_codes"