--- mcore-src/trunk/mcore-tools/daemon/client/include/printing.client.class	2012/08/13 09:54:01	2012
+++ mcore-src/trunk/mcore-tools/src/modules/lprng/printing.client.class.in	2015/09/17 14:02:24	2582
@@ -1,6 +1,6 @@
 # $Id$
 
-provide lprng
+provide printing lprng
 
 help_printing_printer()
 {
@@ -29,17 +29,17 @@
 	[[ -z ${name} ]] && help_printing_printer && return 1
 	[[ -z ${port} ]] && help_printing_printer && return 1
 
-	[[ ! -d ${MROOT}/etc/printcap.d ]] && install -d ${MROOT}/etc/printcap.d
+	[[ ! -d ${MROOT}@@SYSCONFDIR@@/printcap.d ]] && install -d ${MROOT}@@SYSCONFDIR@@/printcap.d
 
 	case ${port} in
 		lpt[0-9]*) port="/dev/lp$(( ${port/lpt/}-1 ))" ;;
 		com[0-9]*) port="/dev/ttyS$(( ${port/com/}-1 ))" ;;
-		usb[0-9]*) port="/dev/usb/lp$(( ${port/usb/}-1 ))" ;;	
+		usb[0-9]*) port="/dev/usb/lp$(( ${port/usb/}-1 ))" ;;
 		#lpd) port="lpd://${ip}/${share}" ;;
 		#socket) port="socket://${ip}:${share}" ;;
 	esac
 
-	CONFIG="${MROOT}/etc/printcap.d/${name}.conf"
+	CONFIG="${MROOT}@@SYSCONFDIR@@/printcap.d/${name}.conf"
 	clearconfig
 	addconfig "${name}|${name}"
 	addconfig "	:lp=${port}"
@@ -57,32 +57,32 @@
 
 	[[ -z ${name} ]] && help_printing_printer && return 1
 
-	if [[ -f ${MROOT}/etc/printcap.d/${name}.conf ]]
+	if [[ -f ${MROOT}@@SYSCONFDIR@@/printcap.d/${name}.conf ]]
 	then
-		rm ${MROOT}/etc/printcap.d/${name}.conf
+		rm ${MROOT}@@SYSCONFDIR@@/printcap.d/${name}.conf
 	fi
 
-	if [[ -d ${MROOT}/var/spool/lpd/${name} ]]
+	if [[ -d ${MROOT}@@LOCALSTATEDIR@@/spool/lpd/${name} ]]
 	then
-		rm -rf ${MROOT}/var/spool/lpd/${name}
+		rm -rf ${MROOT}@@LOCALSTATEDIR@@/spool/lpd/${name}
 	fi
 
-	if [[ -d ${MROOT}/var/log/lprng/${name} ]]
+	if [[ -d ${MROOT}@@LOCALSTATEDIR@@/log/lprng/${name} ]]
 	then
-		rm -rf ${MROOT}/var/log/lprng/${name}
+		rm -rf ${MROOT}@@LOCALSTATEDIR@@/log/lprng/${name}
 	fi
-	
+
 	# regenerate printcap
 	helper_generate_printcap
 }
 
 set_printing_printer()
 {
-	local action="$1"
-	local name="$2"
-	local port="$3"
-	local ip="$4"
-	local share="$5"
+	local action="${CLASS_ARGV[0]}"
+	local name="${CLASS_ARGV[1]}"
+	local port="${CLASS_ARGV[2]}"
+	local ip="${CLASS_ARGV[3]}"
+	local share="${CLASS_ARGV[4]}"
 
 	case "${action}" in
 		add) helper_addprinter "${name}" "${port}" "${ip}" "${share}" ;;
@@ -93,7 +93,7 @@
 
 get_printing_printer()
 {
-	list_files_in_directory ${MROOT}/etc/printcap.d
+	list_files_in_directory ${MROOT}@@SYSCONFDIR@@/printcap.d
 }
 
 helper_generate_printcap()
@@ -101,10 +101,10 @@
 	local i
 	local prn
 
-	CONFIG="${MROOT}/etc/printcap"
+	CONFIG="${MROOT}@@SYSCONFDIR@@/printcap"
 	clearconfig
 
-	for i in $(find ${MROOT}/etc/printcap.d -type f -name \*.conf)
+	for i in $(find ${MROOT}@@SYSCONFDIR@@/printcap.d -type f -name \*.conf)
 	do
 		mecho "adding ${i}"
 		addconfig "#--- added by mcored ---"
@@ -115,12 +115,12 @@
 		prn=$(basename ${i} .conf)
 
 		# install spooler directories
-		install -o lp -g lp -m0700 -d ${MROOT}/var/spool/lpd/${prn}
+		install -o lp -g lp -m0700 -d ${MROOT}@@LOCALSTATEDIR@@/spool/lpd/${prn}
 
 		# create empty log files
-		install -d ${MROOT}/var/log/lprng
-		touch ${MROOT}/var/log/lprng/${prn}
-		chown lp:lp ${MROOT}/var/log/lprng/${prn}
-		chmod 0600 ${MROOT}/var/log/lprng/${prn}
+		install -d ${MROOT}@@LOCALSTATEDIR@@/log/lprng
+		touch ${MROOT}@@LOCALSTATEDIR@@/log/lprng/${prn}
+		chown lp:lp ${MROOT}@@LOCALSTATEDIR@@/log/lprng/${prn}
+		chmod 0600 ${MROOT}@@LOCALSTATEDIR@@/log/lprng/${prn}
 	done
 }