mirror of
https://github.com/smxi/inxi.git
synced 2024-11-17 00:31:19 +00:00
tweaks, clean up chassis output
This commit is contained in:
parent
034a197d8d
commit
a016006173
11
inxi
11
inxi
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
########################################################################
|
########################################################################
|
||||||
#### Script Name: inxi
|
#### Script Name: inxi
|
||||||
#### version: 1.6.1
|
#### version: 1.6.2
|
||||||
#### Date: June 8 2011
|
#### Date: June 8 2011
|
||||||
########################################################################
|
########################################################################
|
||||||
#### SPECIAL THANKS
|
#### SPECIAL THANKS
|
||||||
|
@ -5991,7 +5991,10 @@ print_machine_data()
|
||||||
b_skip_chassis='true'
|
b_skip_chassis='true'
|
||||||
fi
|
fi
|
||||||
if [[ -n ${A_MACHINE_DATA[12]} && $b_skip_chassis != 'true' ]];then
|
if [[ -n ${A_MACHINE_DATA[12]} && $b_skip_chassis != 'true' ]];then
|
||||||
chassis_vendor="${C1}Chassis${C2} ${A_MACHINE_DATA[12]}"
|
# no need to print the vendor string again if it's the same
|
||||||
|
if [[ ${A_MACHINE_DATA[12]} != ${A_MACHINE_DATA[0]} ]];then
|
||||||
|
chassis_vendor=" ${A_MACHINE_DATA[12]}"
|
||||||
|
fi
|
||||||
if [[ -n ${A_MACHINE_DATA[13]} ]];then
|
if [[ -n ${A_MACHINE_DATA[13]} ]];then
|
||||||
chassis_type=" ${C1}type${C2} ${A_MACHINE_DATA[13]}"
|
chassis_type=" ${C1}type${C2} ${A_MACHINE_DATA[13]}"
|
||||||
fi
|
fi
|
||||||
|
@ -6001,7 +6004,9 @@ print_machine_data()
|
||||||
if [[ -n ${A_MACHINE_DATA[15]} && $B_OUTPUT_FILTER != 'true' ]];then
|
if [[ -n ${A_MACHINE_DATA[15]} && $B_OUTPUT_FILTER != 'true' ]];then
|
||||||
chassis_serial=" ${C1}serial${C2} ${A_MACHINE_DATA[15]}"
|
chassis_serial=" ${C1}serial${C2} ${A_MACHINE_DATA[15]}"
|
||||||
fi
|
fi
|
||||||
chassis_line="$chassis_vendor$chassis_type$chassis_version$chassis_serial"
|
if [[ -n "$chassis_vendor$chassis_type$chassis_version$chassis_serial" ]];then
|
||||||
|
chassis_line="${C1}Chassis${C2}$chassis_vendor$chassis_type$chassis_version$chassis_serial"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if [[ -n ${A_MACHINE_DATA[5]} ]];then
|
if [[ -n ${A_MACHINE_DATA[5]} ]];then
|
||||||
|
|
Loading…
Reference in a new issue