mirror of
https://github.com/smxi/inxi.git
synced 2025-01-31 10:02:18 +00:00
new version, bug fix, adding 3D controller to output causes doubled card id in some cases.
This commit is contained in:
parent
58d95fff6f
commit
1325cb6574
11
inxi
11
inxi
|
@ -1,8 +1,8 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
########################################################################
|
########################################################################
|
||||||
#### Script Name: inxi
|
#### Script Name: inxi
|
||||||
#### Version: 2.1.5
|
#### Version: 2.1.6
|
||||||
#### Date: 2014-03-17
|
#### Date: 2014-03-18
|
||||||
#### Patch Number: 00
|
#### Patch Number: 00
|
||||||
########################################################################
|
########################################################################
|
||||||
#### SPECIAL THANKS
|
#### SPECIAL THANKS
|
||||||
|
@ -4915,7 +4915,8 @@ get_graphics_card_data()
|
||||||
IGNORECASE=1
|
IGNORECASE=1
|
||||||
busId=""
|
busId=""
|
||||||
}
|
}
|
||||||
/vga compatible controller|display controller|3D controller/ {
|
# not using 3D controller yet, needs research: |3D controller
|
||||||
|
/vga compatible controller|display controller/ {
|
||||||
gsub(/'"$BAN_LIST_NORMAL"'/, "", $NF)
|
gsub(/'"$BAN_LIST_NORMAL"'/, "", $NF)
|
||||||
gsub(/,/, " ", $NF)
|
gsub(/,/, " ", $NF)
|
||||||
gsub(/^ +| +$/, "", $NF)
|
gsub(/^ +| +$/, "", $NF)
|
||||||
|
@ -9827,7 +9828,7 @@ print_info_data()
|
||||||
fi
|
fi
|
||||||
# info_data="$info_data"
|
# info_data="$info_data"
|
||||||
closing_data="$client_data${C1}$SCRIPT_NAME$SEP3${C2} $SCRIPT_VERSION_NUMBER$patch_version_number"
|
closing_data="$client_data${C1}$SCRIPT_NAME$SEP3${C2} $SCRIPT_VERSION_NUMBER$patch_version_number"
|
||||||
|
calculate_line_length "$info_data$init_data$gcc_installed"
|
||||||
# sometimes gcc is very long, and default runlevel can be long with systemd, so create a gcc-less line first
|
# sometimes gcc is very long, and default runlevel can be long with systemd, so create a gcc-less line first
|
||||||
if [[ $( calculate_line_length "$info_data$init_data$gcc_installed" ) -gt $COLS_INNER ]];then
|
if [[ $( calculate_line_length "$info_data$init_data$gcc_installed" ) -gt $COLS_INNER ]];then
|
||||||
# info_data=$info_data
|
# info_data=$info_data
|
||||||
|
@ -9867,7 +9868,7 @@ print_info_data()
|
||||||
|
|
||||||
eval $LOGFE
|
eval $LOGFE
|
||||||
}
|
}
|
||||||
|
#print_info_data;exit
|
||||||
print_machine_data()
|
print_machine_data()
|
||||||
{
|
{
|
||||||
eval $LOGFS
|
eval $LOGFS
|
||||||
|
|
|
@ -1,3 +1,15 @@
|
||||||
|
=====================================================================================
|
||||||
|
Version: 2.1.6
|
||||||
|
Patch Version: 00
|
||||||
|
Script Date: 2014-03-18
|
||||||
|
-----------------------------------
|
||||||
|
Changes:
|
||||||
|
-----------------------------------
|
||||||
|
new version, bug fix, adding 3D controller to output causes doubled card id in some cases.
|
||||||
|
|
||||||
|
-----------------------------------
|
||||||
|
-- Harald Hope - Tue, 18 Mar 2014 19:17:55 -0700
|
||||||
|
|
||||||
=====================================================================================
|
=====================================================================================
|
||||||
Version: 2.1.5
|
Version: 2.1.5
|
||||||
Patch Version: 00
|
Patch Version: 00
|
||||||
|
|
Loading…
Reference in a new issue