Merge pull request #197 from nickhilliard/master

fix white space and CR problems on xos model

1 files changed, 3 insertions, 1 deletions

diff --git a/lib/oxidized/model/xos.rb b/lib/oxidized/model/xos.rb
index 309340f..e4a1ed4 100644
--- a/lib/oxidized/model/xos.rb
+++ b/lib/oxidized/model/xos.rb
@@ -6,7 +6,9 @@ class XOS < Oxidized::Model
   comment  '# '
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    # xos inserts leading \r characters and other trailing white space.
+    # this deletes extraneous \r and trailing white space.
+    cfg.each_line.to_a[1..-2].map{|line|line.delete("\r").rstrip}.join("\n") + "\n"
   end
 
   cmd 'show version' do |cfg|