--- mcore-src/trunk/mcore-tools/daemon/client/mcored.sh 2012/08/13 09:40:07 2006 +++ mcore-src/trunk/mcore-tools/daemon/client/mcored.in 2014/01/10 08:54:27 2126 @@ -1,6 +1,12 @@ #!/bin/bash -MCLIBDIR="/usr/lib/mcored" +MCLIBDIR="@@MCLIBDIR@@" + +# respect system env (proxy settings etc) +if [ -e @@ETCDIR@@/profile ] +then + source @@ETCDIR@@/profile +fi # globals source ${MCLIBDIR}/include/daemon.global.class @@ -12,8 +18,8 @@ load_client_classes # config settings -source /etc/mcore/config.rc -#source /etc/mcore/serial +source @@ETCDIR@@/mcore/config.rc +#source @@ETCDIR@@/mcore/serial # import_hardware_resource() # { @@ -52,6 +58,9 @@ run=run valid_session=no +# tell what we are +echo "Connected to $(print_version)" + while [[ ${run} = run ]] do read line @@ -73,6 +82,8 @@ colors) export NOCOLORS="false" ;; webcrlf) export WEBCRLF="true" ;; quiet) export QUIET="true" ;; + # version does not need auth + version) print_version ;; help*) if valid_session then