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
textmate · Dec 27, 2013 · 66eb105 · 66eb105
1 parent 9cc6b41
commit 66eb105
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
diff --git a/Commands/Completion….tmCommand b/Commands/Completion….tmCommand
@@ -6,7 +6,7 @@
 	<string>nop</string>
 	<key>command</key>
 	<string>
-export WORD=$(ruby -- &lt;&lt;-SCR1 
+export WORD=$(/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -- &lt;&lt;-SCR1 
 	require File.join(ENV["TM_SUPPORT_PATH"], "lib/current_word.rb")
 	word = Word.current_word('\w\.')
 	print word

diff --git a/Commands/Option List as Pull Down… : BoolToggler.tmCommand b/Commands/Option List as Pull Down… : BoolToggler.tmCommand
@@ -7,7 +7,7 @@
 	<key>command</key>
 	<string>LIST=$(cat)
 [[ -z "$LIST" ]] &amp;&amp; exit_discard
-echo -en "$LIST"  | ruby -e '
+echo -en "$LIST"  | /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -e '
 	require File.join(ENV["TM_SUPPORT_PATH"], "lib/ui.rb")
 	require File.join(ENV["TM_SUPPORT_PATH"], "lib/exit_codes.rb")
 	words = STDIN.read().split("|")

diff --git a/Commands/R Web Search for Word:Selection.tmCommand b/Commands/R Web Search for Word:Selection.tmCommand
@@ -10,7 +10,7 @@
 
 
 if [ -z "$TM_SELECTED_TEXT" ]; then
-	WORD=$(ruby -- &lt;&lt;-SCR1 
+	WORD=$(/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -- &lt;&lt;-SCR1 
 		require File.join(ENV["TM_SUPPORT_PATH"], "lib/current_word.rb")
 		word = Word.current_word('\w\.')
 		word.gsub!(/^[\d\.\-]+$/,"")

diff --git a/Commands/RSiteSearch for Word:Selection.tmCommand b/Commands/RSiteSearch for Word:Selection.tmCommand
@@ -10,7 +10,7 @@
 
 
 if [ -z "$TM_SELECTED_TEXT" ]; then
-	WORD=$(ruby -- &lt;&lt;-SCR1 
+	WORD=$(/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -- &lt;&lt;-SCR1 
 		require File.join(ENV["TM_SUPPORT_PATH"], "lib/current_word.rb")
 		word = Word.current_word('\w\.')
 		word.gsub!(/^[\d\.\-]+$/,"")

diff --git a/Commands/Show Function Usage.tmCommand b/Commands/Show Function Usage.tmCommand
@@ -9,7 +9,7 @@
 [[ -f "${TM_SUPPORT_PATH}/lib/bash_init.sh" ]] &amp;&amp; . "${TM_SUPPORT_PATH}/lib/bash_init.sh"
 
 if [ -z "$TM_SELECTED_TEXT" ]; then
-	export WORD=$(ruby -- &lt;&lt;-SCR1 
+	export WORD=$(/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -- &lt;&lt;-SCR1 
 		require File.join(ENV["TM_SUPPORT_PATH"], "lib/current_word.rb")
 		word = Word.current_word('\w\.:')
 		word.gsub!(/^[\d\.\-]+$/,"")

diff --git a/Commands/Show R Help for actual Word:Selection.tmCommand b/Commands/Show R Help for actual Word:Selection.tmCommand
@@ -17,7 +17,7 @@ done
 RhelperAnswer="/tmp/textmate_Rhelper_out"
 
 if [ -z "$TM_SELECTED_TEXT" ]; then
-	WORD=$(ruby -- &lt;&lt;-SCR1 
+	WORD=$(/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -- &lt;&lt;-SCR1 
 		require File.join(ENV["TM_SUPPORT_PATH"], "lib/current_word.rb")
 		word = Word.current_word('\w\.:')
 		word.gsub!(/^[\d\.\-]+$/,"")

diff --git a/Commands/“require(xxx)” for current Function.tmCommand b/Commands/“require(xxx)” for current Function.tmCommand
@@ -15,7 +15,7 @@ LINE=$(cat | perl -e '
 	$lineR=~s/(?=[\$`\\])/\\/g;
 	print "$lineL\${0:}$lineR";
 ')
-WORD=$(ruby -- &lt;&lt;-SCR1 
+WORD=$(/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -- &lt;&lt;-SCR1 
 	require File.join(ENV["TM_SUPPORT_PATH"], "lib/current_word.rb")
 	word = Word.current_word('\w._\(')
 	print word
@@ -34,7 +34,7 @@ if [ -z "$LIB" ]; then
 fi
 
 if [ `echo "$LIB" | wc -l` -gt 1 ]; then
-	LIB=$(echo "$LIB" | sort -f | ruby -e '
+	LIB=$(echo "$LIB" | sort -f | /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -e '
 		require File.join(ENV["TM_SUPPORT_PATH"], "lib/ui.rb")
 		require File.join(ENV["TM_SUPPORT_PATH"], "lib/exit_codes.rb")
 		words = STDIN.read().split("\n")

diff --git a/Support/bin/auto_show_func_usage.sh b/Support/bin/auto_show_func_usage.sh
@@ -1,5 +1,5 @@
 
-export WORD=$(ruby -- <<-SCR1
+export WORD=$(/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -- <<-SCR1
 print ENV['TM_CURRENT_LINE'][0...ENV['TM_LINE_INDEX'].to_i].gsub!(/ *$/, "").match(/[\w.:]*$/).to_s
 SCR1
 )

diff --git a/Support/bin/insert_package_name.sh b/Support/bin/insert_package_name.sh
@@ -1,7 +1,7 @@
 
 "$TM_BUNDLE_SUPPORT"/bin/askRhelperDaemon.sh "@getInstalledPackages()"
 
-cat "/tmp/textmate_Rhelper_out" | sort -f | ruby -e '
+cat "/tmp/textmate_Rhelper_out" | sort -f | /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -e '
 	isDIALOG2 = ! ENV["DIALOG"].match(/2$/).nil?
 	require File.join(ENV["TM_SUPPORT_PATH"], "lib/ui.rb")
 	require File.join(ENV["TM_SUPPORT_PATH"], "lib/exit_codes.rb")

diff --git a/Support/bin/prefix_package_name.sh b/Support/bin/prefix_package_name.sh
@@ -13,7 +13,7 @@ LINE=$(cat | perl -e '
 	$lineR=~s/^([\w_\.]*)/$1\${0:}/;
 	print "$lineL\n$lineR";
 ')
-WORD=$(ruby -- <<-SCR1 
+WORD=$(/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -- <<-SCR1 
 	require File.join(ENV["TM_SUPPORT_PATH"], "lib/current_word.rb")
 	word = Word.current_word('\w._')
 	print word
@@ -32,7 +32,7 @@ if [ -z "$LIB" ]; then
 fi
 
 if [ `echo "$LIB" | wc -l` -gt 1 ]; then
-	LIB=$(echo "$LIB" | sort -f | ruby -e '
+	LIB=$(echo "$LIB" | sort -f | /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -e '
 		require File.join(ENV["TM_SUPPORT_PATH"], "lib/ui.rb")
 		require File.join(ENV["TM_SUPPORT_PATH"], "lib/exit_codes.rb")
 		words = STDIN.read().split("\n")

diff --git a/Support/bin/startRhelperDaemon.sh b/Support/bin/startRhelperDaemon.sh
@@ -13,7 +13,7 @@ if [ -z "$RPID" ]; then
 			mkfifo "$PIPE"
 		fi
 	fi
-	ruby RhelperDaemon.rb &> /dev/null &
+	/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby RhelperDaemon.rb &> /dev/null &
 	SAFECNT=0
 	while [ 1 ]
 	do