mirror of
https://github.com/smxi/inxi.git
synced 2025-01-19 00:47:47 +00:00
(Change Version)
Trying out defaulting to /etc/lsb-release unless it's mint in /etc/issue, that gives more accurate readouts
This commit is contained in:
parent
881628d7f0
commit
6003c8a002
24
inxi
24
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
|
||||
|
|
Loading…
Reference in a new issue