Fix Cake Start and Cake Restart to not hang

samnardoni · Sep 24, 2010 · 5e363cc · 5e363cc
1 parent 1f3f4f3
commit 5e363cc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/Commands/Cake Start.tmCommand b/Commands/Cake Start.tmCommand
@@ -11,7 +11,15 @@
 . "${TM_SUPPORT_PATH}/lib/webpreview.sh"
 # Prepare output window.
 html_header 'Starting Cake...'
-echo `cake start` | perl -ne 's/\n/&lt;br&gt;/g;print;'</string>
+cat &lt;&lt;END_SHELL
+&lt;p&gt;This may take a few seconds...&lt;/p&gt;
+&lt;pre&gt;&lt;code id="output"&gt;&lt;/code&gt;&lt;/pre&gt;
+&lt;script type="text/javascript" charset="utf-8"&gt;
+  var s       = document.getElementById("output");
+  var res     = TextMate.system("cd ${TM_PROJECT_DIRECTORY}; cake start", null).outputString;
+  s.innerHTML = res.replace(/\n/g, "&lt;br /&gt;");
+&lt;/script&gt;
+END_SHELL</string>
 	<key>input</key>
 	<string>selection</string>
 	<key>keyEquivalent</key>

diff --git a/Commands/Restart Cake.tmCommand b/Commands/Restart Cake.tmCommand
@@ -11,7 +11,15 @@
 . "${TM_SUPPORT_PATH}/lib/webpreview.sh"
 # Prepare output window.
 html_header 'Restarting Cake...'
-echo `cake restart` | perl -ne 's/\n/&lt;br&gt;/g;print;'</string>
+cat &lt;&lt;END_SHELL
+&lt;p&gt;This may take a few seconds...&lt;/p&gt;
+&lt;pre&gt;&lt;code id="output"&gt;&lt;/code&gt;&lt;/pre&gt;
+&lt;script type="text/javascript" charset="utf-8"&gt;
+  var s       = document.getElementById("output");
+  var res     = TextMate.system("cd ${TM_PROJECT_DIRECTORY}; cake restart", null).outputString;
+  s.innerHTML = res.replace(/\n/g, "&lt;br /&gt;");
+&lt;/script&gt;
+END_SHELL</string>
 	<key>input</key>
 	<string>selection</string>
 	<key>keyEquivalent</key>