cleaned up some variable misnamings

This commit is contained in:
inxi-svn 2010-02-13 06:10:31 +00:00
parent 05b5cef12c
commit d43a83d93d

12
inxi
View file

@ -3221,14 +3221,14 @@ get_ps_data()
mem="" mem=""
pid="" pid=""
user="" user=""
vsz="" rss=""
} }
{ {
cpu=$3 cpu=$3
mem=$4 mem=$4
pid=$2 pid=$2
user=$1 user=$1
vsz=sprintf( "%.2f", $6/1024 ) rss=sprintf( "%.2f", $6/1024 )
if ( $12 ~ /^\// ){ if ( $12 ~ /^\// ){
appStarterPath=$11 appStarterPath=$11
appPath=$12 appPath=$12
@ -3241,7 +3241,7 @@ get_ps_data()
appStarterName=gensub( /(\/.*\/)(.*)/, "\\2", "1", $11 ) appStarterName=gensub( /(\/.*\/)(.*)/, "\\2", "1", $11 )
appName=gensub( /(\/.*\/)(.*)/, "\\2", "1", $11 ) appName=gensub( /(\/.*\/)(.*)/, "\\2", "1", $11 )
} }
print appName "," appPath "," appStarterName "," appStarterPath "," cpu "," mem "," pid "," vsz "," user print appName "," appPath "," appStarterName "," appStarterPath "," cpu "," mem "," pid "," rss "," user
} }
' ) ) ' ) )
# make the array ordered highest to lowest so output looks the way we expect it to # make the array ordered highest to lowest so output looks the way we expect it to
@ -4799,7 +4799,7 @@ print_ps_item()
{ {
eval $LOGFS eval $LOGFS
local a_ps_data='' ps_data='' line_starter='' line_start_data='' full_line='' local a_ps_data='' ps_data='' line_starter='' line_start_data='' full_line=''
local app_name='' app_pid='' app_starter_name='' app_cpu='' app_vsz='' app_mem='' local app_name='' app_pid='' app_cpu='' app_mem=''
local b_print_first=$2 line_counter=0 i=0 count_nu='' extra_data='' local b_print_first=$2 line_counter=0 i=0 count_nu='' extra_data=''
case $1 in case $1 in
@ -4839,7 +4839,7 @@ print_ps_item()
fi fi
;; ;;
mem) mem)
app_vsz=" ${C1}mem:${C2} ${a_ps_data[7]}MB (${a_ps_data[5]}%)${C2}" app_mem=" ${C1}mem:${C2} ${a_ps_data[7]}MB (${a_ps_data[5]}%)${C2}"
if [[ $B_EXTRA_DATA == 'true' ]];then if [[ $B_EXTRA_DATA == 'true' ]];then
extra_data=" ${C1}cpu:${C2} ${a_ps_data[4]}%" extra_data=" ${C1}cpu:${C2} ${a_ps_data[4]}%"
fi fi
@ -4847,7 +4847,7 @@ print_ps_item()
esac esac
(( line_counter++ )) (( line_counter++ ))
count_nu="${C1}$line_counter -${C2}" count_nu="${C1}$line_counter -${C2}"
full_line="$count_nu$app_cpu$app_vsz$app_name$app_pid$extra_data" full_line="$count_nu$app_cpu$app_mem$app_name$app_pid$extra_data"
ps_data=$( create_print_line " " "$full_line" ) ps_data=$( create_print_line " " "$full_line" )
print_screen_output "$ps_data" print_screen_output "$ps_data"
done done