mirror of
https://github.com/smxi/inxi.git
synced 2024-11-16 16:21:39 +00:00
More output cleanup, more consistent and easy to read hopefullyO
This commit is contained in:
parent
9da615b89b
commit
1a23eb245e
16
inxi
16
inxi
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
########################################################################
|
||||
#### Script Name: inxi
|
||||
#### version: 0.1.38
|
||||
#### version: 0.1.39
|
||||
#### Date: October 29 2008
|
||||
########################################################################
|
||||
#### inxi is a fork of infobash, the original bash sys info script by locsmif
|
||||
|
@ -93,7 +93,7 @@ SCRIPT_NAME="inxi"
|
|||
SCRIPT_PATH=$( dirname $0 )
|
||||
SCRIPT_VERSION_NUMBER=$( grep -im 1 'version:' $SCRIPT_PATH/$SCRIPT_NAME | awk '{print $3}' )
|
||||
SCRIPT_DATE=$( grep -im 1 'date:' $SCRIPT_PATH/$SCRIPT_NAME | awk '{print $3 " " $4 ", " $5}' )
|
||||
MY_VERSION="$SCRIPT_NAME v:$SCRIPT_VERSION_NUMBER"
|
||||
SCRIPT_VERSION="$SCRIPT_NAME v:$SCRIPT_VERSION_NUMBER"
|
||||
KONVI_CFG="konversation/scripts/$SCRIPT_NAME.conf" # relative path to $(kde-config --path data)
|
||||
|
||||
## Script Localization
|
||||
|
@ -1194,10 +1194,10 @@ print_gfx_data()
|
|||
i=1
|
||||
while [[ -n ${GFX[i]} && $i -le 3 ]]
|
||||
do
|
||||
gfx_data=$( echo -ne " ${C1}$(($i+1))${C2} ${GFX[i]} " )
|
||||
gfx_data=$( echo -ne " ${C1}Card-$(($i+1))${C2} ${GFX[i]} " )
|
||||
(( i++ ))
|
||||
done
|
||||
card_one='(1)'
|
||||
card_one='Card-1'
|
||||
fi
|
||||
gfx_data=$( create_print_line "Graphics:" "${C1}$card_one${C2} ${A_GFX_DATA[0]}${gfx_data}" )
|
||||
if [ "$X" -gt 0 ]
|
||||
|
@ -1256,7 +1256,7 @@ print_intro_data()
|
|||
|
||||
print_networking_data()
|
||||
{
|
||||
local i='' card_plural='s' card_one='(1) ' network_data=''
|
||||
local i='' card_plural='s' card_one='Card-1 ' network_data=''
|
||||
|
||||
if [[ -n ${A_NETWORK_DATA[@]} ]]
|
||||
then
|
||||
|
@ -1270,7 +1270,7 @@ print_networking_data()
|
|||
print_screen_output "$network_data"
|
||||
while [[ -n ${A_NETWORK_DATA[++i]} ]]
|
||||
do
|
||||
network_data=$( create_print_line " " "${C1}($(($i+1)))${C2} ${A_NETWORK_DATA[i]}" )
|
||||
network_data=$( create_print_line " " "${C1}Card-$(($i+1))${C2} ${A_NETWORK_DATA[i]}" )
|
||||
print_screen_output "$network_data"
|
||||
done
|
||||
fi
|
||||
|
@ -1310,7 +1310,7 @@ print_short_data()
|
|||
then
|
||||
short_data="${short_data}$( echo -ne " ${C1}Client${CN}[${C2}${IRC_CLIENT}${IRC_CLIENT_VERSION}${CN}]" )"
|
||||
fi
|
||||
short_data="${short_data} ${C1}${MY_VERSION}${CN}"
|
||||
short_data="${short_data} | ${C1}${SCRIPT_VERSION}${CN}"
|
||||
if [ "$SCHEME" -gt 0 ]
|
||||
then
|
||||
short_data="${short_data}$( echo -ne "$NORMAL" )"
|
||||
|
@ -1335,7 +1335,7 @@ print_system_data()
|
|||
then
|
||||
system_data="${system_data}$( echo -ne " | ${C1}Client${C2} ${IRC_CLIENT}${IRC_CLIENT_VERSION}${CN}" )"
|
||||
fi
|
||||
system_data="${system_data}$( echo -ne " | ${C1}${MY_VERSION}" )"
|
||||
system_data="${system_data}$( echo -ne " | ${C1}${SCRIPT_VERSION}" )"
|
||||
|
||||
if [ "$SCHEME" -gt 0 ]
|
||||
then
|
||||
|
|
Loading…
Reference in a new issue