--- mcore-src/trunk/mcore-tools/daemon/include/daemon.global.class 2013/05/08 11:04:43 2044
+++ mcore-src/trunk/mcore-tools/src/include/daemon.global.class.in 2014/01/13 14:25:18 2258
@@ -1,14 +1,14 @@
# $Id$
-# loads client classes from $MCLIBDIR
+# loads client classes from $MCORE_LIBDIR
load_client_classes()
{
local i
# client specific
- for i in $(find ${MCLIBDIR}/include -type f -name \*.client.class)
+ for i in $(find ${MCORE_LIBDIR}/include -type f -name \*.client.class)
do
- source ${i} || eecho "error loading ${i}"
+ include ${i} || eecho "error loading ${i}"
done
}
@@ -78,7 +78,7 @@
then
"${method}"_"${class}"_"${cmd}" ${argv}
else
- eecho "unkown method '${method}' . class '${class}' . cmd '${cmd}'"
+ eecho "unknown method '${method}' . class '${class}' . cmd '${cmd}'"
fi
else
invalid_session
@@ -122,69 +122,6 @@
mecho "Type 'help [topic]' for more information about every topic."
}
-# on newer xorg-servers root is not allowed to run progs in a user session
-x11runas()
-{
- if [[ -n $(pidof X) ]]
- then
- su - "${MCORE_UNPRIV_USER}" -c "DISPLAY=${MCORE_XORG_DISPLAY} $@"
- fi
-}
-
-addconfig()
-{
- local opts
-
- if [[ -z ${CONFIG} ]]
- then
- eecho "You must define \$CONFIG varibale first!"
- return 1
- fi
-
- if [[ ! -d $(dirname ${CONFIG}) ]]
- then
- install -d $(dirname ${CONFIG})
- fi
-
- # check for opts
- case $1 in
- -n) shift; opts=" -n" ;;
- -e) shift; opts=" -e" ;;
- esac
-
- echo ${opts} "$@" >> ${CONFIG}
-}
-
-clearconfig()
-{
- if [[ -z ${CONFIG} ]]
- then
- eecho "You must define \$CONFIG varibale first!"
- return 1
- fi
-
- if [[ ! -d $(dirname ${CONFIG}) ]]
- then
- install -d $(dirname ${CONFIG})
- fi
- : > ${CONFIG}
-}
-
-# no_duplicate $list $item
-no_duplicate()
-{
- local i
- local list="$1"
- local item="$2"
-
- for i in ${list}
- do
- [[ ${i} = ${item} ]] && return 1
- done
-
- return 0
-}
-
require()
{
local requires="$@"
@@ -226,7 +163,8 @@
# show missing and set the right retval
if [[ -z ${missing} ]]
then
- rvecho "${sorted}"
+ # do not escape, or CRLFS get printed to screen too
+ rvecho ${sorted}
return 0
else
for req in ${sorted}
@@ -234,12 +172,14 @@
if no_duplicate "${missing}" "$req"
then
# print normal
- rvecho -n " ${req}"
+ rvecho -n "${req} "
else
# print missing
- eecho -n " ${req}"
+ eecho -n "${req} "
fi
done
+ # print CRLF
+ echo
return 1
fi
}
@@ -271,104 +211,6 @@
rvecho ${sorted}
}
-# message only echo | disabled in quiet mode
-mecho()
-{
- local COLCYAN="\033[1;36m"
- local COLDEFAULT="\033[0m"
- local opts
- local webcrlf
-
- # print nothing if quiet mode was requested
- [[ ${QUIET} = true ]] && return
-
- if [[ ${NOCOLORS} = true ]]
- then
- COLCYAN=""
- COLDEFAULT=""
- fi
-
- [[ ${WEBCRLF} = true ]] && webcrlf="
"
-
- # respect -n
- case $1 in
- -n) shift; opts="n" ;;
- esac
-
- echo -e${opts} "${COLCYAN}$@${COLDEFAULT}${webcrlf}"
-}
-
-# prints error messages | enabled even in quiet mode
-eecho()
-{
- local COLRED="\033[1;31m"
- local COLDEFAULT="\033[0m"
- local opts
- local webcrlf
-
- if [[ ${NOCOLORS} = true ]]
- then
- COLRED=""
- COLDEFAULT=""
- fi
-
- [[ ${WEBCRLF} = true ]] && webcrlf="
"
-
- # respect -n
- case $1 in
- -n) shift; opts="n" ;;
- esac
-
- echo -e${opts} "${COLRED}$@${COLDEFAULT}${webcrlf}"
-}
-
-# prints return values of get | enabled even in quiet mode
-rvecho()
-{
- local COLPURPLE="\033[1;35m"
- local COLDEFAULT="\033[0m"
- local opts
- local webcrlf
-
- if [[ ${NOCOLORS} = true ]]
- then
- COLPURPLE=""
- COLDEFAULT=""
- fi
-
- [[ ${WEBCRLF} = true ]] && webcrlf="
"
-
- # respect -n
- case $1 in
- -n) shift; opts="n" ;;
- esac
-
- echo -e${opts} "${COLPURPLE}$@${COLDEFAULT}${webcrlf}"
-}
-
-# prints debug messages if requested | enabled even in quiet mode
-decho()
-{
- # print nothing if debug mode was *not* requested
- [[ ${DEBUG} != 1 ]] && return
-
- eecho "DEBUG: ${@}"
-}
-
-path_not_empty()
-{
- local path="$1"
- [[ -z ${path} ]] && eecho "path_not_empty(): no path given!" && return 1
-
- # return ERR if path does not exist
- [[ ! -d ${path} ]] && return 1
- # return ERR if path empty
- [[ -z $(find "${path}" -mindepth 1 -maxdepth 1) ]] && return 1
-
- # every thing went ok, directory not empty
- return 0
-}
-
help_daemon_mroot()
{
mecho "get daemon.mroot"
@@ -396,51 +238,7 @@
fi
}
-list_files_in_directory()
+print_version()
{
- local i
- local retval
- local path
- local opts
- local type
-
- # basic getops
- for i in $*
- do
- case $1 in
- -mindepth) shift; opts+=" -mindepth $1" ;;
- -maxdepth) shift; opts+=" -maxdepth $1" ;;
- -type) shift; type="$1" ;;
- '') continue ;;
- *) path="$1" ;;
- esac
- shift
- done
-
- if [[ -z ${path} ]]
- then
- eecho "No path given."
- return 1
- fi
-
- if [[ ! -d ${path} ]]
- then
- eecho "Directory '${path}' does not exist."
- return 1
- fi
-
- # default to files
- [[ -z ${type} ]] && type=f
-
- for i in $(find ${path} ${opts} -type ${type} | sort)
- do
- if [[ -z ${retval} ]]
- then
- retval="$(basename ${i})"
- else
- retval="${retval} $(basename ${i})"
- fi
- done
-
- rvecho "${retval}"
+ echo "mcored-$(<${MCORE_LIBDIR}/VERSION)"
}