bsd bash doesn't like the *"value"* bash test, so had to remove it.

This commit is contained in:
inxi-svn 2014-03-17 04:13:32 +00:00
parent 8d6b87f9d8
commit c9b53cdbcd

8
inxi
View file

@ -813,9 +813,9 @@ initialize_data()
BSD_VERSION=$( uname -s 2>/dev/null | tr '[A-Z]' '[a-z]' )
# note: archbsd says they are a freebsd distro, so assuming it's the same as freebsd
if [[ *"bsd"* == "$BSD_VERSION" ]];then
if [[ -n $( grep 'bsd' <<< "$BSD_VERSION" ) ]];then
# GNU/kfreebsd will by definition have GNU tools like sed/grep
if [[ *"kfreebsd"* == "$BSD_VERSION" ]];then
if [[ -n $( grep 'kfreebsd' <<< "$BSD_VERSION" ) ]];then
BSD_TYPE='debian-bsd' # debian gnu bsd
else
BSD_TYPE='bsd' # all other bsds
@ -3109,7 +3109,7 @@ get_irc_client_version()
print $2
}' )"
if [[ -n $IRC_CLIENT_VERSION ]] && \
[[ *"limnoria"* == $IRC_CLIENT_VERSION || $App_Working_Name == 'limnoria' ]];then
[[ -n $( grep 'limnoria' <<< $IRC_CLIENT_VERSION ) || $App_Working_Name == 'limnoria' ]];then
IRC_CLIENT="Limnoria"
else
IRC_CLIENT="Supybot"
@ -6441,7 +6441,7 @@ get_optical_drive_data()
fi
disk=${disk##*/} # puppy shows this as /dev/sr0, not sr0
# if [[ -z $dev_disks_real || -z $( grep $disk <<< $dev_disks_real ) ]];then
if [[ -n $disk && *"$disk"* != $dev_disks_real ]];then
if [[ -n $disk && -z $( grep "$disk" <<< $dev_disks_real ) ]];then
# need line break IFS for below, no white space
dev_disks_real="$dev_disks_real$separator$disk"
separator=$'\n'