new tarball, last patch, now globally strip out (x86_64/i686 type data too

This commit is contained in:
inxi-svn 2012-11-17 23:22:19 +00:00
parent ac174c5b94
commit d519d13c02

15
inxi
View file

@ -3685,7 +3685,7 @@ get_distro_data()
fi
fi
fi
if [[ ${#distro} -gt 80 ]] && [[ $B_HANDLE_CORRUPT_DATA != 'true' ]];then
distro="${RED}/etc/${distro_file} corrupted, use -% to override${NORMAL}"
fi
@ -3711,7 +3711,16 @@ get_distro_data()
distro='unknown'
fi
fi
# final step cleanup of unwanted information
# opensuse has the x86 etc type string in names, not needed as redundant since -S already shows that
distro=$( gawk '
BEGIN {
IGNORECASE=1
}
{
sub(/ *\((x86_64|i486|i586|i686|686|586|486)\)/, "", $0)
print $0
}' <<< $distro )
echo "$distro"
log_function_data "distro: $distro"
eval $LOGFE
@ -3849,8 +3858,6 @@ get_lsb_os_release_data()
}
}
# opensuse has the x86 string in names, not needed as redundant
sub(/ *\(x86_64\)| *\(686\)/, "", distroName)
print distroName
}
' $FILE_OS_RELEASE )