dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2025-09-04 19:49:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

new version, new tarball, new man page.

Browse source 
small change -Ixx will show running in tty if it's not in X, with tty number.

sort of redundant to System: console: data, but that's ok, we'll live for now.
This commit is contained in:
inxi-svn 2013-01-29 00:22:50 +00:00
parent 4d59973cd1
commit 84137bfac8
3 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
inxi
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### version: 1.8.33 #### version: 1.8.34
#### Date: January 28 2013 #### Date: January 28 2013
#### Patch Number: 00 #### Patch Number: 00
######################################################################## ########################################################################
@ -2299,7 +2299,7 @@ show_options()
print_screen_output " -D - Adds disk serial number." print_screen_output " -D - Adds disk serial number."
print_screen_output " -G - Adds chip vendor:product ID for each video card." print_screen_output " -G - Adds chip vendor:product ID for each video card."
print_screen_output " -I - Adds other detected installed gcc versions to primary gcc output (if present)." print_screen_output " -I - Adds other detected installed gcc versions to primary gcc output (if present)."
print_screen_output " Adds parent program for shell info if running in X (like Konsole or Gterm)." print_screen_output " Adds parent program (or tty) for shell info if not in IRC (like Konsole or Gterm)."
print_screen_output " -M - Adds chassis information, if any data for that is available." print_screen_output " -M - Adds chassis information, if any data for that is available."
print_screen_output " -N - Adds chip vendor:product ID for each nic." print_screen_output " -N - Adds chip vendor:product ID for each nic."
print_screen_output " -R - Adds superblock (if present); algorythm, U data. Adds system info line (kernel support," print_screen_output " -R - Adds superblock (if present); algorythm, U data. Adds system info line (kernel support,"
@ -7623,7 +7623,7 @@ print_info_data()
eval $LOGFS eval $LOGFS
local info_data='' line_starter='Info:' local info_data='' line_starter='Info:'
local runlvl='' client_data='' shell_data='' shell_parent='' local runlvl='' client_data='' shell_data='' shell_parent='' tty_session=''
local memory="$( get_memory_data )" local memory="$( get_memory_data )"
local processes="$(( $( ps aux | wc -l ) - 1 ))" local processes="$(( $( ps aux | wc -l ) - 1 ))"
local up_time="$( get_uptime )" local up_time="$( get_uptime )"
@ -7648,8 +7648,12 @@ print_info_data()
shell_data=$( get_shell_data ) shell_data=$( get_shell_data )
if [[ -n $shell_data ]];then if [[ -n $shell_data ]];then
# note, if you start this in tty, it will give 'login' as the parent, which we don't want. # note, if you start this in tty, it will give 'login' as the parent, which we don't want.
if [[ $B_EXTRA_EXTRA_DATA == 'true' && $B_RUNNING_IN_X == 'true' ]];then if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
shell_parent=$( get_shell_parent ) shell_parent=$( get_shell_parent )
if [[ $B_RUNNING_IN_X != 'true' ]];then
shell_parent=$( basename "$( tty 2>/dev/null )" | sed 's/[^0-9]*//g' )
shell_parent="tty $shell_parent"
fi
if [[ $shell_parent == 'login' ]];then if [[ $shell_parent == 'login' ]];then
shell_parent='' shell_parent=''
elif [[ -n $shell_parent ]];then elif [[ -n $shell_parent ]];then

2
inxi.1
View file

@ -331,7 +331,7 @@ The following shows which lines / items get extra information with each extra da
- Adds other detected installed gcc versions to primary gcc output (if present). - Adds other detected installed gcc versions to primary gcc output (if present).
.TP .TP
.B -xx -I .B -xx -I
- Adds parent program that started shell if running in X and not IRC client to shell information. - Adds parent program (or tty) that started shell, if not IRC client, to shell information.
.TP .TP
.B -xx -M .B -xx -M
- Adds chassis information, if any data for that is available. - Adds chassis information, if any data for that is available.

16
inxi.changelog
View file

@ -1,3 +1,19 @@
=====================================================================================
Version: 1.8.34
Patch Version: 00
Script Date: January 28 2013
-----------------------------------
Changes:
-----------------------------------
new version, new tarball, new man page.
small change -Ixx will show running in tty if it's not in X, with tty number.
sort of redundant to System: console: data, but that's ok, we'll live for now.
-----------------------------------
-- Harald Hope - Mon, 28 Jan 2013 16:12:45 -0800
===================================================================================== =====================================================================================
Version: 1.8.33 Version: 1.8.33
Patch Version: 00 Patch Version: 00