fixing breakage

This commit is contained in:
trash80.v2.0 2008-12-20 06:35:20 +00:00
parent a037fa5fd3
commit 1b559f0c33

24
inxi
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### version: 0.8.11.b2 #### version: 0.8.11.b2.3
#### Date: December 16 2008 #### Date: December 16 2008
######################################################################## ########################################################################
#### inxi is a fork of infobash 3.02, the original bash sys info script by locsmif #### 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}" distro_file="${i}"
break break
fi fi
done done
## now check for the known good lsb-release distro's
fi fi
######################################################################################################################################### #########################################################################################################################################
# first test for the legacy antiX distro id file # 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 # 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 # 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. # if there's a specific distro release file available, that's to be preferred, but this is a good backup.
elif [[ $distro = '' ]];then elif [[ $distro = '' ]];then ## now check for the known good lsb-release distro's
for j in $DISTROS_LSB_GOOD if [[ -f /etc/lsb-release ]];then
do for j in $DISTROS_LSB_GOOD
if [[ " ${distro_file} " == *" $j "* ]];then do
distro=$( get_distro_lsb_data ) if [[ " ${distro_file} " == *" $j "* ]];then
fi distro=$( get_distro_lsb_data )
done fi
done
fi
# then if the distro id file was found and it's not in the exluded primary distro file list, read it # 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 elif [[ -n $distro_file && -s /etc/$distro_file && " $DISTROS_EXCLUDE_LIST " != *" $distro_file "* ]];then
distro=$( remove_erroneous_chars "/etc/$distro_file" ) distro=$( remove_erroneous_chars "/etc/$distro_file" )
@ -2245,7 +2245,7 @@ print_audio_data()
if [[ -n ${a_audio_working[0]} ]];then if [[ -n ${a_audio_working[0]} ]];then
audio_data="${C1}Card-$(( $i + 1 )) ${C2}${a_audio_working[0]}$alsa_driver$port_data" audio_data="${C1}Card-$(( $i + 1 )) ${C2}${a_audio_working[0]}$alsa_driver$port_data"
fi 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" ) audio_data=$( create_print_line " " "$audio_data" )
print_screen_output "$audio_data" print_screen_output "$audio_data"
fi fi