Updated TM bundle handles errors on connecting to remote process.

elektronaut · Oct 23, 2009 · 68792e1 · 68792e1
1 parent d940e2c
commit 68792e1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/extras/textmate/Ruby Livecode.tmbundle/Commands/Execute Document.tmCommand b/extras/textmate/Ruby Livecode.tmbundle/Commands/Execute Document.tmCommand
@@ -18,6 +18,8 @@ rescue LivecodeServer::ConnectionError =&gt; e
 	puts "Livecode server not running!\n\n"
 	puts '- Press ⌘B to start in daemon mode'
 	puts '- Run in Terminal with "livecode run"'
+rescue DRb::DRbBadURI =&gt; e
+	puts "Error! Can't connect to remote server."
 rescue Exception =&gt; e
 	puts "Error!"
 	puts "  #{e.class}: #{e}"

diff --git a/extras/textmate/Ruby Livecode.tmbundle/Commands/Execute Selection:Line.tmCommand b/extras/textmate/Ruby Livecode.tmbundle/Commands/Execute Selection:Line.tmCommand
@@ -18,6 +18,8 @@ rescue LivecodeServer::ConnectionError =&gt; e
 	puts "Livecode server not running!\n\n"
 	puts '- Press ⌘B to start in daemon mode'
 	puts '- Run in Terminal with "livecode run"'
+rescue DRb::DRbBadURI =&gt; e
+	puts "Error! Can't connect to remote server."
 rescue Exception =&gt; e
 	puts "Error!"
 	puts "  #{e.class}: #{e}"

diff --git a/extras/textmate/Ruby Livecode.tmbundle/Commands/Execute Selection:Scope.tmCommand b/extras/textmate/Ruby Livecode.tmbundle/Commands/Execute Selection:Scope.tmCommand
@@ -18,6 +18,8 @@ rescue LivecodeServer::ConnectionError =&gt; e
 	puts "Livecode server not running!\n\n"
 	puts '- Press ⌘B to start in daemon mode'
 	puts '- Run in Terminal with "livecode run"'
+rescue DRb::DRbBadURI =&gt; e
+	puts "Error! Can't connect to remote server."
 rescue Exception =&gt; e
 	puts "Error!"
 	puts "  #{e.class}: #{e}"

diff --git a/lib/livecode_server/command.rb b/lib/livecode_server/command.rb
@@ -218,11 +218,11 @@ def update_textmate
 							print "\nReplace? [y/n] "
 						end
 					else
-						puts "Existing bundle found, are you sure you want to replace it? [y/n] "
+						print "Existing bundle found, are you sure you want to replace it? [y/n] "
 					end
 					if update_bundle
 						if STDIN.readline.chomp =~ /^y/i
-							`sudo rm #{escaped_target_path}`
+							`sudo rm -rf #{escaped_target_path}`
 						else
 							update_bundle = false
 						end