From ad72530667e00074ff0f6dc1b4430aa70c2dc6a3 Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Tue, 26 Apr 2011 18:14:47 +0000 Subject: [PATCH] some output tweaks --- inxi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/inxi b/inxi index 953d009..d6c6c20 100755 --- a/inxi +++ b/inxi @@ -1,7 +1,7 @@ #!/bin/bash ######################################################################## #### Script Name: inxi -#### version: 1.4.82-b10 +#### version: 1.4.82-b11 #### Date: April 26 2011 ######################################################################## #### SPECIAL THANKS @@ -355,8 +355,8 @@ shopt -u nullglob ORIGINAL_IFS="$IFS" # These two determine separators in single line output, to force irc clients not to break off sections -SEP1='-' -SEP2='~' +SEP1=':-' +SEP2=' ' ### Script names/paths - must be non root writable SCRIPT_DATA_DIR="$HOME/.inxi" @@ -945,7 +945,7 @@ select_default_color_scheme() print_screen_output "------------------------------------------------------------------------------" print_screen_output "After finding the scheme number you like, simply run this again in a terminal to set the configuration" print_screen_output "data file for your irc client. You can set color schemes for the following: start inxi with -c plus:" - print_screen_output "96 (Gui IRC, in X); 97 (terminal irc client, in X); 98 (console irc, no X) - like: $SCRIPT_NAME -c 97" + print_screen_output "94 (console, no X); 95 (terminal, X); 96 (irc, X); 97 (irc, X, in terminal); 98 (irc, no X); 99 (global) - like: $SCRIPT_NAME -c 97" exit 0 fi @@ -4578,12 +4578,12 @@ print_short_data() #C1="${C1},1"; C2="${C2},1"; CN="${CN},1" fi fi - short_data="${C1}CPU$cpc_plural${CN}[${C2}${SEP1}${cpu_data_string} ${cpu_model}$model_plural (${cpu_type}) clocked at ${min_max_clock}${SEP1}${CN}] ${C1}Kernel${CN}[${C2}${SEP1}${current_kernel}${SEP1}${CN}] ${C1}Up${CN}[${C2}${SEP1}${up_time}${SEP1}${CN}] ${C1}Mem${CN}[${C2}${SEP1}${memory}${SEP1}${CN}] ${C1}HDD${CN}[${C2}${SEP1}${hdd_capacity}($hdd_used)${SEP1}${CN}] ${C1}Procs${CN}[${C2}${SEP1}${processes}${SEP1}${CN}]" + short_data="${C1}CPU$cpc_plural${C2}${SEP1}${cpu_data_string} ${cpu_model}$model_plural (${cpu_type}) clocked at ${min_max_clock}${SEP2}${C1}Kernel${C2}${SEP1}${current_kernel}${SEP2}${C1}Up${C2}${SEP1}${up_time}${SEP2}${C1}Mem${C2}${SEP1}${memory}${SEP2}${C1}HDD${C2}${SEP1}${hdd_capacity}($hdd_used)${SEP2}${C1}Procs${C2}${SEP1}${processes}${SEP2}" if [[ $SHOW_IRC -gt 0 ]];then - short_data="${short_data} ${C1}Client${CN}[${C2}${SEP1}${IRC_CLIENT}${IRC_CLIENT_VERSION}${SEP1}${CN}]" + short_data="${short_data}${C1}Client${C2}${SEP1}${IRC_CLIENT}${IRC_CLIENT_VERSION}${SEP2}" fi - short_data="${short_data} ${C1}$SCRIPT_NAME${C2}${CN}[${C2}${SEP1}$SCRIPT_VERSION_NUMBER${SEP1}${CN}]" + short_data="${short_data}${C1}$SCRIPT_NAME${C2}${SEP1}$SCRIPT_VERSION_NUMBER${SEP2}${CN}" if [[ $SCHEME -gt 0 ]];then short_data="${short_data} $NORMAL" fi