/[mcore-svn]/mcore-src/trunk/mcore-tools/src/include/daemon.global.class.in

Diff of /mcore-src/trunk/mcore-tools/src/include/daemon.global.class.in

Parent Directory | Revision Log | View Patch Patch

-revision 1264 by niro,
Fri Feb  4 20:13:23 2011 UTC
+revision 1639 by niro,
Thu Mar 10 18:08:47 2011 UTC
 Line 26 
 run_class()
  	local cmd
  	local argv
- 	if validate_session
+ 	if valid_session
  	then
  		class="${caller%.*}"
  		cmd="${caller#*.}"
 Line 44 
 run_class()
  		then
  			"${method}"_"${class}"_"${cmd}" ${argv}
  		else
-  			echo "unkown method '${method}' . class '${class}' . cmd '${cmd}'"
+  			eecho "unkown method '${method}' . class '${class}' . cmd '${cmd}'"
  		fi
  	else
  		invalid_session
 Line 58 
 help_topics()
  	topics=$(typeset -f | grep '^help_' | sed 's:help_\(.*\)\ .*():\1:' | sed 's:_:\.:' | sort)
  	mecho "Global commands:"
- 	mecho "\timport  - import settings to database"
+ 	mecho "\timport   - import settings to database"
- 	mecho "\tget     - shows current value for a settings"
+ 	mecho "\tget      - shows current value for a settings"
- 	mecho "\tset     - sets value for a setting"
+ 	mecho "\tset      - sets value for a setting"
- 	mecho "\tauth    - authenticate to the daemon"
+ 	mecho "\tauth     - authenticate to the daemon"
- 	mecho "\tprovide - shows provides of a system"
+ 	mecho "\tprovide  - shows provides of a system"
- 	mecho "\thelp    - shows help"
+ 	mecho "\trequire  - verify plugin requirements"
- 	mecho "\tquit    - quits the connection to the server"
+ 	mecho "\tnocolors - disable colors, useful for the webclient"
+ 	mecho "\tquiet    - do not print any unecessary messages"
+ 	mecho "\thelp     - shows help"
+ 	mecho "\tquit     - quits the connection to the server"
  	mecho
  	mecho "Help topics:"
  	for i in ${topics}
-Line 83 
 help_topics()
+Line 86 
 help_topics()
  # on newer xorg-servers root is not allowed to run progs in a user session
  x11runas()
  {
- 	su - "${MCORE_UNPRIV_USER}" -c "DISPLAY=${MCORE_XORG_DISPLAY} $@"
+ 	if pidof X
+ 	then
+ 		su - "${MCORE_UNPRIV_USER}" -c "DISPLAY=${MCORE_XORG_DISPLAY} $@"
+ 	fi
  }
  addconfig()
  {
+ 	local opts
  	if [[ -z ${CONFIG} ]]
  	then
- 		echo "You must define \$CONFIG varibale first!"
+ 		eecho "You must define \$CONFIG varibale first!"
  		return 1
  	fi
-Line 98 
 addconfig()
+Line 106 
 addconfig()
  	then
  		install -d $(dirname ${CONFIG})
  	fi
- 	echo "$@" >> ${CONFIG}
+ 	# check for opts
+ 	case $1 in
+ 		-n) shift; opts=" -n" ;;
+ 		-e) shift; opts=" -e" ;;
+ 	esac
+ 	echo ${opts} "$@" >> ${CONFIG}
  }
  clearconfig()
  {
  	if [[ -z ${CONFIG} ]]
  	then
- 		echo "You must define \$CONFIG varibale first!"
+ 		eecho "You must define \$CONFIG varibale first!"
  		return 1
  	fi
-Line 143 
 require()
+Line 158 
 require()
  		then
  			export REQUIRE="${REQUIRE} ${i}"
  		else
- 			[[ ${DEBUG} = 1 ]] && echo "duplicate provide '${i}' detected!"
+ 			decho "duplicate provide '${i}' detected!"
  		fi
  	done
  }
-Line 172 
 verify_requirements()
+Line 187 
 verify_requirements()
  	# show missing and set the right retval
  	if [[ -z ${missing} ]]
  	then
- 		mecho "${sorted}"
+ 		rvecho "${sorted}"
  		return 0
  	else
  		for req in ${sorted}
-Line 180 
 verify_requirements()
+Line 195 
 verify_requirements()
  			if no_duplicate "${missing}" "$req"
  			then
  				# print normal
- 				mecho -n " ${req}"
+ 				rvecho -n " ${req}"
  			else
  				# print missing
  				eecho -n " ${req}"
-Line 202 
 provide()
+Line 217 
 provide()
  		then
  			export PROVIDE="${PROVIDE} ${i}"
  		else
- 			[[ ${DEBUG} = 1 ]] && echo "duplicate provide '${i}' detected!"
+ 			decho "duplicate provide '${i}' detected!"
  		fi
  	done
  }
-Line 214 
 print_provide()
+Line 229 
 print_provide()
  	# sort them alpabetically
  	sorted=$(for i in ${PROVIDE}; do echo "${i}"; done | sort)
  	# do not escape, or CRLFS get printed to screen too
- 	mecho ${sorted}
+ 	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
-Line 229 
 mecho()
+Line 249 
 mecho()
  		COLDEFAULT=""
  	fi
+ 	[[ ${WEBCRLF} = true ]] && webcrlf="<br>"
  	# respect -n
  	case $1 in
  		-n) shift; opts="n" ;;
  	esac
- 	echo -e${opts} "${COLCYAN}$@${COLDEFAULT}"
+ 	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
-Line 249 
 eecho()
+Line 273 
 eecho()
  		COLDEFAULT=""
  	fi
+ 	[[ ${WEBCRLF} = true ]] && webcrlf="<br>"
+ 	# 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="<br>"
  	# respect -n
  	case $1 in
  		-n) shift; opts="n" ;;
  	esac
- 	echo -e${opts} "${COLRED}$@${COLDEFAULT}"
+ 	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} ]] && "path_not_empty(): no path given!" && return 1
+ 	[[ -z ${path} ]] && eecho "path_not_empty(): no path given!" && return 1
  	# return ERR if path does not exist
  	[[ ! -d ${path} ]] && return 1

 Legend:



Removed from v.1264
 


changed lines


 
Added in v.1639
 Legend:



Removed from v.1264
 


changed lines


 
Added in v.1639
-Removed from v.1264
+Added in v.1639