From 8e39e9b21a10d8a50b7f3fe4cfb16f2aa9479840 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Sun, 28 Jan 2018 22:23:49 +0100 Subject: [PATCH] show-switch: Do not display newlines --- show-switch | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/show-switch b/show-switch index 0e23fdc..8126e8e 100755 --- a/show-switch +++ b/show-switch @@ -92,6 +92,10 @@ my $basics = my_get_table({ }); print Dumper($basics) if $debug; my $bas = $basics->{0} or die "Cannot find basic info"; +for (values %$bas) { + s{\r}{}gs; + s{\n}{ | }gs; +} print "### Basics ###\n\n"; print "Device: ", $bas->{desc}, "\n"; @@ -228,7 +232,7 @@ for my $port (@ifaces) { $speed = int($speed/1000); $speed = "${speed}G"; } - printf "%-4d %-15.15s %s%-4s %-5s %s%-20s%s", $port, $if->{name}, $scolor, $state, $speed, $t_yellow, $if->{alias}, $t_norm; + printf "%-4d %-15.15s %s%-4s %-5s %s%-25.25s%s", $port, $if->{name}, $scolor, $state, $speed, $t_yellow, $if->{alias}, $t_norm; if ($mac) { my $show_mac = ""; @@ -238,7 +242,7 @@ for my $port (@ifaces) { $show_mac = $macs[0]; $more_macs = "${t_yellow}+${t_norm}" if @macs > 1; } - printf "%-17s%s ", $show_mac, $more_macs; + printf " %-17s%s ", $show_mac, $more_macs; } for my $vid (@vlans) { -- 2.39.2