dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2025-01-19 08:57:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(No Version Change)

Browse source 
Tweaked get distro lsb data a bit to avoid confusion in the future, but no change to handling.
This commit is contained in:
inxi-svn 2008-11-11 03:15:27 +00:00
parent 11e38953c4
commit 17031b8f10
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
inxi
View file

@ -1074,11 +1074,12 @@ get_distro_data()
echo "$distro" echo "$distro"
} }
# args: $1 - optional, app, uses the app test, not being used now
get_distro_lsb_data() get_distro_lsb_data()
{ {
local distro='' local distro=''
if [[ -f /etc/lsb-release ]];then if [[ -f /etc/lsb-release && $1 != 'app' ]];then
distro=$( gawk -F '=' ' distro=$( gawk -F '=' '
{ IGNORECASE=1 } { IGNORECASE=1 }
@ -1097,8 +1098,9 @@ get_distro_lsb_data()
END { END {
print distroId " " distroRelease " (" distroCodename ")" print distroId " " distroRelease " (" distroCodename ")"
}' /etc/lsb-release ) }' /etc/lsb-release )
fi
# this is HORRIBLY slow, but I don't know why, it runs fast in shell # this is HORRIBLY slow, but I don't know why, it runs fast in shell
# elif [[ -n $( which lsb_release ) ]];then # if [[ -n $( which lsb_release ) && $1 == 'app' ]];then
# distro=$( echo "$( lsb_release -irc )" | gawk ' # distro=$( echo "$( lsb_release -irc )" | gawk '
# { IGNORECASE=1 } # { IGNORECASE=1 }
# /^Distributor ID/ { # /^Distributor ID/ {
@ -1116,7 +1118,7 @@ get_distro_lsb_data()
# END { # END {
# print distroId " " distroRelease " (" distroCodename ")" # print distroId " " distroRelease " (" distroCodename ")"
# }' ) # }' )
fi # fi
echo $distro echo $distro
} }