--- mcore-src/trunk/mcore-tools/daemon/client/mcored.sh	2011/02/06 23:46:25	1305
+++ mcore-src/trunk/mcore-tools/src/mcored.in	2014/01/13 09:27:41	2243
@@ -1,22 +1,26 @@
 #!/bin/bash
 
-MCLIBDIR="/usr/lib/mcored"
+MCORE_LIBDIR="@@MCORE_LIBDIR@@"
+
+# respect system env (proxy settings etc)
+if [ -e @@SYSCONFDIR@@/profile ]
+then
+	source @@SYSCONFDIR@@/profile
+fi
 
 # globals
-source ${MCLIBDIR}/include/daemon.global.class
-source ${MCLIBDIR}/include/sessionauth.global.class
-#source ${MCLIBDIR}/include/mysqlfunctions.global.class
-source ${MCLIBDIR}/include/hwdetection.global.class
+source ${MCORE_LIBDIR}/include/common.global.class
+source ${MCORE_LIBDIR}/include/daemon.global.class
+source ${MCORE_LIBDIR}/include/sessionauth.global.class
+#source ${MCORE_LIBDIR}/include/mysqlfunctions.global.class
+source ${MCORE_LIBDIR}/include/hwdetection.global.class
 
-# client specific
-for i in ${MCLIBDIR}/include/*.client.class
-do
-	source ${i} || echo "error loading ${i}"
-done
+# load client classes plugins
+load_client_classes
 
 # config settings
-source /etc/mcore/config.rc
-source /etc/mcore/serial
+source @@SYSCONFDIR@@/mcore/mcore.conf
+#source @@SYSCONFDIR@@/mcore/serial
 
 # import_hardware_resource()
 # {
@@ -48,10 +52,16 @@
 # }
 
 DEBUG=1
+NOCOLORS="false"
+WEBCRLF="false"
+QUIET="false"
 
 run=run
 valid_session=no
 
+# tell what we are
+echo "Connected to $(print_version)"
+
 while [[ ${run} = run ]]
 do
 	read line
@@ -66,8 +76,15 @@
 		auth*) validate_auth ${line/auth /} ;;
 		provide) valid_session && print_provide ;;
 		require) valid_session && verify_requirements ;;
+		reload) valid_session && mecho "reloading client classes ..." && load_client_classes ;;
+		restart) valid_session && restart_service ;;
+		stop) valid_session && stop_service ;;
 		nocolors) export NOCOLORS="true" ;;
+		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
@@ -84,10 +101,9 @@
 			;;
 
 		*)
-			mecho "Unkown command '${line}'"
+			mecho "Unknown command '${line}'"
 			mecho "Type 'help' for more information."
-			echo "$line" >> /root/lala.log
+			#echo "$line" >> /root/lala.log
 			;;
 	esac
 done
-