bugfix support for run/stop jobs combination

The combination of running *and* stopped jobs was not displayed.
Refactor the jobcount function: arguments of conditions is now in the same order
as the display.
This commit is contained in:
nojhan 2012-08-10 15:08:08 +02:00
parent 0943eb67a9
commit 3e80f5fc29

View File

@ -420,23 +420,33 @@ __jobcount_color()
local m_stop="z" local m_stop="z"
local m_run="&" local m_run="&"
if [[ $running != "0" && $stopped != "0" && $screens != "0" ]] ; then # d/&/z
if [[ $screens != "0" && $running != "0" && $stopped != "0" ]] ; then
rep="${NO_COL}${YELLOW}${screens}${m_detached}${NO_COL}/${YELLOW}${running}${m_run}${NO_COL}/${BOLD_YELLOW}${stopped}${m_stop}${NO_COL}" rep="${NO_COL}${YELLOW}${screens}${m_detached}${NO_COL}/${YELLOW}${running}${m_run}${NO_COL}/${BOLD_YELLOW}${stopped}${m_stop}${NO_COL}"
elif [[ $running != "0" && $stopped == "0" && $screens == "0" ]] ; then # _/&/_
elif [[ $screens == "0" && $running != "0" && $stopped == "0" ]] ; then
rep="${NO_COL}${YELLOW}${running}${m_run}${NO_COL}" rep="${NO_COL}${YELLOW}${running}${m_run}${NO_COL}"
elif [[ $running == "0" && $stopped != "0" && $screens == "0" ]] ; then # _/_/z
elif [[ $screens == "0" && $running == "0" && $stopped != "0" ]] ; then
rep="${NO_COL}${BOLD_YELLOW}${stopped}${m_stop}${NO_COL}" rep="${NO_COL}${BOLD_YELLOW}${stopped}${m_stop}${NO_COL}"
elif [[ $running == "0" && $stopped == "0" && $screens != "0" ]] ; then # d/_/_
elif [[ $screens != "0" && $running == "0" && $stopped == "0" ]] ; then
rep="${NO_COL}${YELLOW}${screens}${m_detached}${NO_COL}" rep="${NO_COL}${YELLOW}${screens}${m_detached}${NO_COL}"
elif [[ $running != "0" && $stopped == "0" && $screens != "0" ]] ; then # d/&/_
elif [[ $screens != "0" && $running != "0" && $stopped == "0" ]] ; then
rep="${NO_COL}${YELLOW}${screens}${m_detached}${NO_COL}/${YELLOW}${running}${m_run}${NO_COL}" rep="${NO_COL}${YELLOW}${screens}${m_detached}${NO_COL}/${YELLOW}${running}${m_run}${NO_COL}"
elif [[ $running == "0" && $stopped != "0" && $screens != "0" ]] ; then # d/_/z
elif [[ $screens != "0" && $running == "0" && $stopped != "0" ]] ; then
rep="${NO_COL}${YELLOW}${screens}${m_detached}${NO_COL}/${BOLD_YELLOW}${stopped}${m_stop}${NO_COL}" rep="${NO_COL}${YELLOW}${screens}${m_detached}${NO_COL}/${BOLD_YELLOW}${stopped}${m_stop}${NO_COL}"
# _/&/z
elif [[ $screens == "0" && $running != "0" && $stopped != "0" ]] ; then
rep="${NO_COL}${YELLOW}${running}${m_run}${NO_COL}/${BOLD_YELLOW}${stopped}${m_stop}${NO_COL}"
fi fi
echo -ne "$rep" echo -ne "$rep"
} }