manual merge

This commit is contained in:
nojhan 2012-08-13 23:17:45 +02:00
commit 0125ee0cef

View File

@ -283,7 +283,7 @@ _lp_user()
_lp_connection()
{
local THIS_TTY
THIS_TTY=$(awk -v pid=$$ '$0 ~ pid && /bash/{ print $7 }' < <(ps aux) )
THIS_TTY=$(awk -v pid=$$ '$0 ~ pid && /${WORKING_SHELL}/{ print $7 }' < <(ps aux) )
local SESS_SRC
SESS_SRC=$(who | awk -v thistty="$THIS_TTY" '$0 ~ thistty { print $6 }')