From 1b559f0c33bdb7dc5845a65debf84612b0ee780f Mon Sep 17 00:00:00 2001 From: "trash80.v2.0" Date: Sat, 20 Dec 2008 06:35:20 +0000 Subject: [PATCH] fixing breakage --- inxi | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/inxi b/inxi index 5b0296b..b440ff8 100644 --- a/inxi +++ b/inxi @@ -1,7 +1,7 @@ #!/bin/bash ######################################################################## #### Script Name: inxi -#### version: 0.8.11.b2 +#### version: 0.8.11.b2.3 #### Date: December 16 2008 ######################################################################## #### inxi is a fork of infobash 3.02, the original bash sys info script by locsmif @@ -1319,9 +1319,7 @@ get_distro_data() distro_file="${i}" break fi - done - ## now check for the known good lsb-release distro's - + done fi ######################################################################################################################################### # first test for the legacy antiX distro id file @@ -1330,13 +1328,15 @@ get_distro_data() # this handles case where only one release/version file was found, and it's lsb-release. This would # never apply for ubuntu or debian, which will filter down to the following conditions. In general # if there's a specific distro release file available, that's to be preferred, but this is a good backup. - elif [[ $distro = '' ]];then - for j in $DISTROS_LSB_GOOD - do - if [[ " ${distro_file} " == *" $j "* ]];then - distro=$( get_distro_lsb_data ) - fi - done + elif [[ $distro = '' ]];then ## now check for the known good lsb-release distro's + if [[ -f /etc/lsb-release ]];then + for j in $DISTROS_LSB_GOOD + do + if [[ " ${distro_file} " == *" $j "* ]];then + distro=$( get_distro_lsb_data ) + fi + done + fi # then if the distro id file was found and it's not in the exluded primary distro file list, read it elif [[ -n $distro_file && -s /etc/$distro_file && " $DISTROS_EXCLUDE_LIST " != *" $distro_file "* ]];then distro=$( remove_erroneous_chars "/etc/$distro_file" ) @@ -2245,7 +2245,7 @@ print_audio_data() if [[ -n ${a_audio_working[0]} ]];then audio_data="${C1}Card-$(( $i + 1 )) ${C2}${a_audio_working[0]}$alsa_driver$port_data" fi - if [[ -n $audio_data ]];then + if [[ -n $audio_data ]];then## now check for the known good lsb-release distro's audio_data=$( create_print_line " " "$audio_data" ) print_screen_output "$audio_data" fi