function _pkgSetVarsBase
{
case "$vserver" in
- /*)
+ ./*|/*)
if test -d "$vserver/vdir"; then
BASEDIR=$vserver
VDIR=$(getPhysicalDir "$vserver/vdir")
test -d "$i" || continue
test ! -e "$i"/disabled || continue
test -d "$i"/vdir || continue
+ case "$i" in
+ *.~*~) continue;;
+ esac
_tmp=( "${_tmp[@]}" "${i##$CONFDIR/}")
done
function getVserverStatus
{
test -r "$1"/run || return 1
- eval read "$2" <"$1"/run
+
+ local _ctx
+ read _ctx <"$1"/run
+ eval "$2"=\$_ctx
test "$3" || return 0
- local _tmp=$($_VPS ax | $_AWK '{print $2}' | $_GREP -x "$ctx" | $_WC -l )
+ local _tmp=$($_VPS ax | $_AWK '{print $2}' | $_GREP -x "$_ctx" | $_WC -l )
eval "$3"=\$_tmp
test "$4" -a $_tmp = 0 || return 0
return 0
}
+## Usage: isCtxRunning <ctx>
+function isCtxRunning
+{
+ local _tmp=$($_VPS ax | $_AWK '{print $2}' | $_GREP -x "$1" | $_WC -l )
+ test $_tmp -gt 0
+}
+
## Usage: isVserverRunning <vdir> [<ctx-varname>]
function isVserverRunning
{