projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
try if this makes nagios happy
[mirror/dsa-puppet.git]
/
modules
/
motd
/
templates
/
motd.erb
diff --git
a/modules/motd/templates/motd.erb
b/modules/motd/templates/motd.erb
index
777ce8f
..
496b5dd
100644
(file)
--- a/
modules/motd/templates/motd.erb
+++ b/
modules/motd/templates/motd.erb
@@
-12,12
+12,8
@@
def wrap(s, width=78)
end
def markup(l)
end
def markup(l)
- if l =~ /\[\[(\*|-)?(.*?)\]\]/
- l = $2
- end
- if l =~ /\[\[(.*?)\|(.*?)\]\]/
- l = $2
- end
+ l = l.gsub(/\[\[(.*?)\|(.*?)\]\]/, '\2')
+ l = l.gsub(/\[\[(\*|-)?(.*?)\]\]/, '\2')
return l
end
return l
end