diff --git a/inxi b/inxi index 14a9cf7..4f995ae 100755 --- a/inxi +++ b/inxi @@ -1,7 +1,7 @@ #!/bin/bash ######################################################################## #### Script Name: inxi -#### version: 0.5.8 +#### version: 0.5.9 #### Date: November 10 2008 ######################################################################## #### inxi is a fork of infobash, the original bash sys info script by locsmif @@ -1050,14 +1050,18 @@ get_distro_data() distro=$( remove_erroneous_chars "/etc/$distro_file" ) # otherwise try the default debian/ubuntu /etc/issue file elif [[ -f /etc/issue ]];then - distro=$( gawk ' - BEGIN { RS="" } { - gsub(/\\[a-z]/, "") - gsub(/,/, " ") - gsub(/^ +| +$/, "") - gsub(/ [ \t]+/, " ") - print - }' /etc/issue ) + if [[ -f /etc/lsb-release && -z $( grep -i 'mint' /etc/issue ) ]];then + distro=$( get_distro_lsb_data ) + else + distro=$( gawk ' + BEGIN { RS="" } { + gsub(/\\[a-z]/, "") + gsub(/,/, " ") + gsub(/^ +| +$/, "") + gsub(/ [ \t]+/, " ") + print + }' /etc/issue ) + fi fi if [[ ${#distro} -gt 80 && $B_HANDLE_CORRUPT_DATA != 'true' ]];then @@ -1105,7 +1109,7 @@ get_distro_lsb_data() distroCodename = $NF } END { - print distroId " " distroRelease " (" distroCodename ")" + print distroId " " distroRelease " " distroCodename }' /etc/lsb-release ) fi # this is HORRIBLY slow, but I don't know why, it runs fast in shell