Use 1.8 of ruby in a few missed places

Fixes #10.
textmate · Oct 24, 2013 · fdbe511 · fdbe511
1 parent 3a178e6
commit fdbe511
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Commands/Show Available Revisions for Merging.tmCommand b/Commands/Show Available Revisions for Merging.tmCommand
@@ -56,7 +56,7 @@ END`
 
 
 "${TM_SVNMERGE:-svnmerge}" avail --log -S "`basename $theHead`" 2&gt;&amp;1 \
-	| ruby -- "$FORMAT_LOG" '--title=Revisions Available for Merging'
+	| /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -- "$FORMAT_LOG" '--title=Revisions Available for Merging'
 </string>
 	<key>input</key>
 	<string>none</string>

diff --git a/Commands/Subversion status.plist b/Commands/Subversion status.plist
@@ -14,9 +14,9 @@ export CommitWindow="$TM_SCM_COMMIT_WINDOW"
 	then
 	export WorkPath="${TM_PROJECT_DIRECTORY:-$TM_DIRECTORY}"
 	export TM_SELECTED_FILES="'"${WorkPath//\'/\'\\\'\'}"'"
-	"${TM_SVN:-svn}" status "$WorkPath" 2&gt;&amp;1| ruby -KU -- "${TM_BUNDLE_SUPPORT}/format_status.rb" "--status"
+	"${TM_SVN:-svn}" status "$WorkPath" 2&gt;&amp;1| /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -KU -- "${TM_BUNDLE_SUPPORT}/format_status.rb" "--status"
 	else
-	eval "${TM_SVN:-svn}" status "$TM_SELECTED_FILES" 2&gt;&amp;1 |ruby -KU -- "${TM_BUNDLE_SUPPORT}/format_status.rb" "--status"
+	eval "${TM_SVN:-svn}" status "$TM_SELECTED_FILES" 2&gt;&amp;1 |/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -KU -- "${TM_BUNDLE_SUPPORT}/format_status.rb" "--status"
 fi; }
 </string>
 	<key>input</key>

diff --git a/Support/Templates/Status.js b/Support/Templates/Status.js
@@ -95,7 +95,7 @@ function displayCommandOutput(id, className, string){
 function svnCommit(){
 
 	cmd  = 'cd "${TM_PROJECT_DIRECTORY:-$TM_DIRECTORY}"; '
-	cmd += 'ruby -- "$TM_BUNDLE_SUPPORT/svn_commit.rb" --output=plaintext "' + WorkPaths.join('" "') + '"'
+	cmd += '/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -- "$TM_BUNDLE_SUPPORT/svn_commit.rb" --output=plaintext "' + WorkPaths.join('" "') + '"'
 
 //	displayCommandOutput('info', 'info', cmd);
 //	document.getElementById('commandOutput').innerHTML = TextMate.system(cmd, null).outputString + ' \\n'

diff --git a/Support/bin/tmsvn.rb b/Support/bin/tmsvn.rb
@@ -10,7 +10,7 @@
 ENV['TM_SVN'] ||= 'svn'
 
 script = ARGV.shift
-out, err = TextMate::Process.run('ruby', "#{File.dirname(__FILE__)}/#{script}.rb", ARGV)
+out, err = TextMate::Process.run('/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby', "#{File.dirname(__FILE__)}/#{script}.rb", ARGV)
 
 STDOUT << out
 TextMate::UI.alert(:critical, "An error occurred within the Subversion bundle", err, "OK") if $? != 0 and not err.empty?