Point to ruby 1.8 shim

infininight · infininight · commit 8b80da055490 · 2014-06-18T03:57:29.000-05:00
Using a shim allows us to catch when 1.8 of ruby is not present and provide other options.

#ignore
diff --git a/Commands/Align Assignments.tmCommand b/Commands/Align Assignments.tmCommand
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+	<string>#!/usr/bin/env ruby18
 #
 # Assignment block tidier, version 0.1.
 #
diff --git a/Commands/Insert Block Comment.tmCommand b/Commands/Insert Block Comment.tmCommand
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -wKU
+	<string>#!/usr/bin/env ruby18 -wKU
 require ENV['TM_SUPPORT_PATH'] + '/lib/escape.rb'
 require ENV['TM_SUPPORT_PATH'] + '/lib/exit_codes.rb'
 
diff --git a/Commands/Insert Source Header.tmCommand b/Commands/Insert Source Header.tmCommand
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+	<string>#!/usr/bin/env ruby18
 
 #
 # Notes:
diff --git a/Commands/Move to EOL and Insert ";".plist b/Commands/Move to EOL and Insert ";".plist
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+	<string>#!/usr/bin/env ruby18
 
 termchar = ENV['TM_LINE_TERMINATOR'] || ";"
 
diff --git a/Commands/Reformat Comment.tmCommand b/Commands/Reformat Comment.tmCommand
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+	<string>#!/usr/bin/env ruby18
 
 $LOAD_PATH &lt;&lt; "#{ENV["TM_SUPPORT_PATH"]}/lib"
 require "escape"
@@ -22,7 +22,7 @@ flags = %Q{-p "#{cstring}"}
 flags += " --retabify" unless ENV["TM_SOFT_TABS"] == "YES"
 flags += " -c #{ENV['TM_COLUMNS'].nil? ? 80 : ENV['TM_COLUMNS']}"
 
-command = "/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby #{e_sh(ENV["TM_BUNDLE_SUPPORT"])}/bin/rubywrap.rb #{flags}"
+command = "ruby18 #{e_sh(ENV["TM_BUNDLE_SUPPORT"])}/bin/rubywrap.rb #{flags}"
 text    = open("| #{command}", "r+") do |wrapper|
   wrapper &lt;&lt; ctext
   wrapper.close_write
diff --git a/Commands/Tabify.plist b/Commands/Tabify.plist
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>saveActiveFile</string>
 	<key>command</key>
-	<string>#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+	<string>#!/usr/bin/env ruby18
 
 # This is a little more convoluted than it needs to be
 # just to ensure that we can do an OK job on really long
diff --git a/Commands/Toggle CamelCase vs Underscore.tmCommand b/Commands/Toggle CamelCase vs Underscore.tmCommand
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+	<string>#!/usr/bin/env ruby18
 
 require ENV['TM_SUPPORT_PATH'] + '/lib/exit_codes'
 
diff --git a/Commands/Toggle Single:Double String Quotes.plist b/Commands/Toggle Single:Double String Quotes.plist
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+	<string>#!/usr/bin/env ruby18
 
 print case str = STDIN.read
   when /\A"(.*)"\z/m; "'" + $1 + "'"
diff --git a/Commands/Toggle comment.plist b/Commands/Toggle comment.plist
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+	<string>#!/usr/bin/env ruby18
 
 # by James Edward Gray II &lt;james (at) grayproductions.net&gt;
 
diff --git a/Commands/Unwrap Braces.tmCommand b/Commands/Unwrap Braces.tmCommand
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -wKU
+	<string>#!/usr/bin/env ruby18 -wKU
 
 def tab
 	ENV['TM_SOFT_TABS'] == 'YES' ? ' ' * ENV['TM_TAB_SIZE'].to_i : "\t"
diff --git a/Commands/Wrap in Braces.tmCommand b/Commands/Wrap in Braces.tmCommand
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -wKU
+	<string>#!/usr/bin/env ruby18 -wKU
 require "pp"
 
 def indent(text)
diff --git a/Macros/Move to EOL and Insert Terminator + LF.plist b/Macros/Move to EOL and Insert Terminator + LF.plist
@@ -12,7 +12,7 @@
 				<key>bundlePath</key>
 				<string>/Users/dpowers/Library/Application Support/TextMate/Bundles/Source.tmbundle</string>
 				<key>command</key>
-				<string>#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+				<string>#!/usr/bin/env ruby18
 
 termchar = ";"
 if ENV['TM_LINE_TERMINATOR']
diff --git a/Support/bin/reindent.rb b/Support/bin/reindent.rb
@@ -1,4 +1,4 @@
-#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+#!/usr/bin/env ruby18
 #
 # ReIndent v0.1
 # By Sune Foldager <cryo at cyanite.org>
diff --git a/Support/bin/rubywrap.rb b/Support/bin/rubywrap.rb
@@ -1,4 +1,4 @@
-#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+#!/usr/bin/env ruby18
 
 #
 # File: rubywrap.rb

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`<key>beforeRunningCommand</key>`
`6`	`6`	`<string>nop</string>`
`7`	`7`	`<key>command</key>`
`8`		`- <string>#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby`
	`8`	`+ <string>#!/usr/bin/env ruby18`
`9`	`9`	`#`
`10`	`10`	`# Assignment block tidier, version 0.1.`
`11`	`11`	`#`