@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>autoScrollOutput</key> @@ -7,7 +7,9 @@ <key>beforeRunningCommand</key> <string>nop</string> <key>command</key> - <string>export RUBYLIB="$TM_BUNDLE_SUPPORT/RubyMate${RUBYLIB:+:$RUBYLIB}" + <string>#!/bin/sh + +export RUBYLIB="$TM_BUNDLE_SUPPORT/RubyMate${RUBYLIB:+:$RUBYLIB}" export TM_RUBY=$(type -p "${TM_RUBY:-ruby}") "${TM_RUBY}" -- "$TM_BUNDLE_SUPPORT/RubyMate/run_script.rb" Commands/Run.tmCommand @@ -1,4 +1,4 @@ -require "ui" +require "#{ENV['TM_SUPPORT_PATH']}/lib/ui" require "io/wait" class TextMateSTDIN < IO Support/RubyMate/stdin_dialog.rb 7ba0db4e1dbc73f6c9429d24be968002e592f860 duff duff@dfb7d73b-c2ec-0310-8fea-fb051d288c6d http://github.com/subtleGradient/ruby.tmbundle/commit/8959f4dbf9796172876b4348e72762efb8d88ec4 8959f4dbf9796172876b4348e72762efb8d88ec4 2007-11-30T22:07:43-08:00 2007-11-30T22:07:43-08:00 • use #!/bin/sh as shebang for “Ruby → Run” and “TextMate → Relaunch”. This is to prevent running ‘Support/lib/bash_init.sh’ which sets up RUBYLIB. Having RUBYLIB set to include Support/lib means users who run scripts that require libraries named the same as those we have in TextMate will likely get the wrong one. Very few commands actually make use of the fact that RUBYLIB is set, so maybe we should edit ‘bash_init.sh’ to simply not set it, although I am waiting with such change till after next build, so we have time to thoroughly test that everything still works. The downside by this change is that running a ruby script in TM intended to be used by a TM command, now require TM support libraries to be included using the full path (or the Support/lib folder be added to the include path). On that note, RubyMate/stdin_dialog.rb had to be updated to do so, since it is indirectly loaded when running scripts (now in an environment w/o Support/lib in RUBYLIB). git-svn-id: http://macromates.com/svn/Bundles/trunk/Bundles/Ruby.tmbundle@8572 dfb7d73b-c2ec-0310-8fea-fb051d288c6d 869241e5db8e12b499cbcd1d168de628f91cea75 duff duff@dfb7d73b-c2ec-0310-8fea-fb051d288c6d