Debugged, and now ready for 1.6.0

New feature: -m, with -xx as optional extra extra data

-m shows system, mobo, bios, and with -xx, chassis, if present.

Will also try to guess at if it's a laptop.
This commit is contained in:
inxi-svn 2011-06-08 06:38:32 +00:00
parent e7f3349e22
commit c45f0176af

11
inxi
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### version: 1.5.999 #### version: 1.6.0
#### Date: June 7 2011 #### Date: June 7 2011
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
@ -1493,7 +1493,7 @@ remove_erroneous_chars()
get_parameters() get_parameters()
{ {
eval $LOGFS eval $LOGFS
local opt='' wget_test='' update_flags='U!:' debug_data_type='' b_extra_extra='false' local opt='' wget_test='' update_flags='U!:' debug_data_type=''
local use_short='true' # this is needed to trigger short output, every v/d/F/line trigger sets this false local use_short='true' # this is needed to trigger short output, every v/d/F/line trigger sets this false
# If distro maintainers want to not allow updates, turn off that option for users # If distro maintainers want to not allow updates, turn off that option for users
@ -1654,11 +1654,11 @@ get_parameters()
V) print_version_info V) print_version_info
exit 0 exit 0
;; ;;
x) B_EXTRA_DATA='true' # this will trigger either with xx or with Fx but not with xF
if [[ $b_extra_extra == 'true' ]];then x) if [[ $B_EXTRA_DATA == 'true' ]];then
B_EXTRA_EXTRA_DATA='true' B_EXTRA_EXTRA_DATA='true'
fi fi
b_extra_extra='true' B_EXTRA_DATA='true'
;; ;;
z) B_OUTPUT_FILTER='true' z) B_OUTPUT_FILTER='true'
;; ;;
@ -5922,7 +5922,6 @@ print_info_data()
info_data="${info_data} ${C1}Runlevel${C2} ${runlvl}${CN}" info_data="${info_data} ${C1}Runlevel${C2} ${runlvl}${CN}"
fi fi
fi fi
if [[ $SHOW_IRC -gt 0 ]];then if [[ $SHOW_IRC -gt 0 ]];then
info_data="${info_data} ${C1}Client${C2} ${IRC_CLIENT}${IRC_CLIENT_VERSION}${CN}" info_data="${info_data} ${C1}Client${C2} ${IRC_CLIENT}${IRC_CLIENT_VERSION}${CN}"
fi fi