get_file_contents calls already remove_cr

This commit is contained in:
Christian Loos 2016-08-30 16:36:21 +02:00
parent 1c13c66e36
commit 600aad227d

View file

@ -1130,7 +1130,6 @@ sub get_other_process_memory {
sub get_os_release { sub get_os_release {
if ( -f "/etc/lsb-release" ) { if ( -f "/etc/lsb-release" ) {
my @info_release = get_file_contents "/etc/lsb-release"; my @info_release = get_file_contents "/etc/lsb-release";
remove_cr @info_release;
my $os_relase = $info_release[3]; my $os_relase = $info_release[3];
$os_relase =~ s/.*="//; $os_relase =~ s/.*="//;
$os_relase =~ s/"$//; $os_relase =~ s/"$//;
@ -1139,13 +1138,11 @@ sub get_os_release {
if ( -f "/etc/system-release" ) { if ( -f "/etc/system-release" ) {
my @info_release = get_file_contents "/etc/system-release"; my @info_release = get_file_contents "/etc/system-release";
remove_cr @info_release;
return $info_release[0]; return $info_release[0];
} }
if ( -f "/etc/os-release" ) { if ( -f "/etc/os-release" ) {
my @info_release = get_file_contents "/etc/os-release"; my @info_release = get_file_contents "/etc/os-release";
remove_cr @info_release;
my $os_relase = $info_release[0]; my $os_relase = $info_release[0];
$os_relase =~ s/.*="//; $os_relase =~ s/.*="//;
$os_relase =~ s/"$//; $os_relase =~ s/"$//;
@ -1154,7 +1151,6 @@ sub get_os_release {
if ( -f "/etc/issue" ) { if ( -f "/etc/issue" ) {
my @info_release = get_file_contents "/etc/issue"; my @info_release = get_file_contents "/etc/issue";
remove_cr @info_release;
my $os_relase = $info_release[0]; my $os_relase = $info_release[0];
$os_relase =~ s/\s+\\n.*//; $os_relase =~ s/\s+\\n.*//;
return $os_relase; return $os_relase;