From 84137bfac80fd109d5b08563bc39d540614da844 Mon Sep 17 00:00:00 2001
From: inxi-svn <inxi-svn@techpatterns.com>
Date: Tue, 29 Jan 2013 00:22:50 +0000
Subject: [PATCH] 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.
---
 inxi           | 12 ++++++++----
 inxi.1         |  2 +-
 inxi.changelog | 16 ++++++++++++++++
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/inxi b/inxi
index 91a1b43..653e558 100755
--- a/inxi
+++ b/inxi
@@ -1,7 +1,7 @@
 #!/bin/bash
 ########################################################################
 ####  Script Name: inxi
-####  version: 1.8.33
+####  version: 1.8.34
 ####  Date: January 28 2013
 ####  Patch Number: 00
 ########################################################################
@@ -2299,7 +2299,7 @@ show_options()
 	print_screen_output "    -D - Adds disk serial number."
 	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 "         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 "    -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,"
@@ -7623,7 +7623,7 @@ print_info_data()
 	eval $LOGFS
 
 	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 processes="$(( $( ps aux | wc -l ) - 1 ))"
 	local up_time="$( get_uptime )"
@@ -7648,8 +7648,12 @@ print_info_data()
 		shell_data=$( get_shell_data )
 		if [[ -n $shell_data ]];then
 			# 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 )
+				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
 					shell_parent=''
 				elif [[ -n $shell_parent ]];then
diff --git a/inxi.1 b/inxi.1
index 62b2d34..f650ee0 100755
--- a/inxi.1
+++ b/inxi.1
@@ -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).
 .TP
 .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
 .B -xx -M 
 - Adds chassis information, if any data for that is available.
diff --git a/inxi.changelog b/inxi.changelog
index aac1ebe..0c61bba 100755
--- a/inxi.changelog
+++ b/inxi.changelog
@@ -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
 Patch Version: 00