--- mcore-src/trunk/mcore-tools/daemon/client/mcored.sh	2011/02/02 20:20:24	1248
+++ mcore-src/trunk/mcore-tools/src/mcored.in	2014/01/10 14:50:59	2202
@@ -1,43 +1,47 @@
 #!/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
-
-import_hardware_resource()
-{
-	local resource="$1"
-	local value
-
-	# special cases
-	case ${resource} in
-		gfxcard) value="$(get_x11_driver_modules)" ;;
-		*) value="$(get_hwinfo --with-description ${resource})" ;;
-	esac
+source @@SYSCONFDIR@@/mcore/config.rc
+#source @@SYSCONFDIR@@/mcore/serial
 
-# 	if [[ ${DEBUG} = 1 ]]
-# 	then
-# 		echo "${resource}=${value}" >> /root/lala.log
-# 		echo "mysqldo \"update status set ${resource}='${value}' where serial=${ALX_SERIAL};\"" >> /root/lala.log
-# 	fi
-# 	mysql_insert status,serial="${ALX_SERIAL}","${resource}"="${value}"
-
-	import_resource status "${ALX_SERIAL}" "${resource}" "${value}"
-}
+# import_hardware_resource()
+# {
+# 	local resource="$1"
+# 	local value
+# 
+# 	# special cases
+# 	case ${resource} in
+# 		gfxcard) value="$(get_x11_driver_modules)" ;;
+# 		*) value="$(get_hwinfo --with-description ${resource})" ;;
+# 	esac
+# 
+# # 	if [[ ${DEBUG} = 1 ]]
+# # 	then
+# # 		echo "${resource}=${value}" >> /root/lala.log
+# # 		echo "mysqldo \"update status set ${resource}='${value}' where serial=${ALX_SERIAL};\"" >> /root/lala.log
+# # 	fi
+# # 	mysql_insert status,serial="${ALX_SERIAL}","${resource}"="${value}"
+# 
+# 	import_resource status "${ALX_SERIAL}" "${resource}" "${value}"
+# }
 
 
 # set_init_state()
@@ -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
@@ -64,9 +74,19 @@
 		get*) run_class ${line} ;;
 		set*) run_class ${line} ;;
 		auth*) validate_auth ${line/auth /} ;;
-		provide) print_provide ;;
+		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 validate_session
+			if valid_session
 			then
 				if [[ ${line} = help ]]
 				then
@@ -83,7 +103,7 @@
 		*)
 			mecho "Unkown command '${line}'"
 			mecho "Type 'help' for more information."
-			echo "$line" >> /root/lala.log
+			#echo "$line" >> /root/lala.log
 			;;
 	esac
 done