Handle SSH hosts without a @

2015-06-17 13:49:18 +02:00
parent 745efce828
commit c6d504edbb
2 changed files with 13 additions and 3 deletions
--- a/src/root/machine-status.tt
+++ b/src/root/machine-status.tt
@ -13,7 +13,7 @@
    </tr>
  </thead>
  [% FOREACH m IN machines %]
-    [% name = m.key ? m.key.match('@(.*)').0 : "localhost" %]
+    [% name = m.key ? stripSSHUser(m.key) : "localhost" %]
    <thead>
      <tr>
        <th colspan="6">
@ -27,7 +27,7 @@
    <tbody>
      [% idle = 1 %]
      [% FOREACH step IN steps %]
-        [% name2 = step.machine ? step.machine.match('@(.*)').0 : "localhost" %]
+        [% name2 = step.machine ? stripSSHUser(step.machine) : "localhost" %]
        [% IF name == name2 %]
          [% idle = 0 %]
          <tr>