--- trunk/include/mtools.sminc	2012/12/21 13:35:02	14481
+++ trunk/include/mtools.sminc	2018/11/30 10:15:39	31554
@@ -1,11 +1,7 @@
 # $Id$
 # some special build tools
 
-# automatical inherit mtools.minc
-# this will provide the service management functions
-INHERITS="${INHERITS} mtools"
-
-# get the pname right with splitpackages
+# get the pname right with split-packages
 mpname()
 {
 	local pname="${PNAME}"
@@ -14,35 +10,145 @@
 	echo "${pname}"
 }
 
-# installs initscripts
-# minstallrc /path/to/rc-script {destfilename}
-minstallrc()
+# installs given directories
+# minstalldir /path/to/dest/dir {/path/to/dest/dirN}
+minstalldir()
+{
+	local argv="$@"
+	local dest
+
+	[[ -z ${argv} ]] && die "No dest dir given"
+	for dest in ${argv}
+	do
+		[[ -d ${BINDIR}${dest} ]] && continue
+		install -v -d ${BINDIR}/${dest} || die
+	done
+}
+
+# install files to given path (defaults to /usr/bin)
+# minstallfile {-s} /path/to/file {/path/to/dest}
+minstallfile()
 {
-	local rcscript
 	local file
+	local dest
 
-	[[ -z "$1" ]] && die "No initscript given"
+	[[ -z $1 ]] && die "No etc file given"
 
-	# if no fullpath given use file from sourcedir
-	if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
+	if [[ $1 = -s ]]
 	then
-		file="${SOURCEDIR}/$(mpname)/$1"
+		file="${SOURCEDIR}/$(mpname)/$2"
+		dest="$3"
+		if [[ -z $3 ]]
+		then
+			dest=/usr/bin
+			install -d ${BINDIR}/${dest} || die
+		fi
 	else
 		file="$1"
+		dest="$2"
+		if [[ -z $2 ]]
+		then
+			dest=/usr/bin
+			install -d ${BINDIR}/${dest} || die
+		fi
 	fi
 
-	if [[ -n "$2" ]]
+	# install our configfile
+	install -v -m 0644 -o root -g root ${file} ${BINDIR}/${dest} || die
+}
+
+# installs executables to given path
+# minstallexec {-s} /path/to/exec {/path/to/dest}
+minstallexec()
+{
+	local file
+	local dest
+
+	[[ -z $1 ]] && die "No file given"
+
+	if [[ $1 = -s ]]
 	then
-		rcscript="$2"
+		file="${SOURCEDIR}/$(mpname)/$2"
+		dest="$3"
+		if [[ -z $3 ]]
+		then
+			dest=/usr/bin
+			install -d ${BINDIR}/${dest} || die
+		fi
 	else
-		rcscript="$(basename ${file})"
+		file="$1"
+		dest="$2"
+		if [[ -z $2 ]]
+		then
+			dest=/usr/bin
+			install -d ${BINDIR}/${dest} || die
+		fi
 	fi
 
-	# needed directory
-	install -d ${BINDIR}/etc/rc.d/init.d || die
+	# install our configfile
+	install -v -m 0755 -o root -g root ${file} ${BINDIR}/${dest} || die
+}
+
+# installs executables to given path
+# minstalllib {-s} /path/to/exec {/path/to/dest}
+minstalllib()
+{
+	local file
+	local dest
+	local verbose="-v"
+
+	# check for busybox as it doesn't support 'ln -v'
+	[[ $(readlink $(which ln)) = */busybox ]] && verbose=""
+
+	[[ -z $1 ]] && die "No file given"
 
-	# install our initscript
-	install -v -m 0755 -o root -g root ${file} ${BINDIR}/etc/rc.d/init.d/${rcscript} || die
+	if [[ $1 = -s ]]
+	then
+		file="${SOURCEDIR}/$(mpname)/$2"
+		dest="$3"
+		if [[ -z $3 ]]
+		then
+			dest=/usr/$(mlibdir)
+			install -d ${BINDIR}/${dest} || die
+		fi
+	else
+		file="$1"
+		dest="$2"
+		if [[ -z $2 ]]
+		then
+			dest=/usr/$(mlibdir)
+			install -d ${BINDIR}/${dest} || die
+		fi
+	fi
+
+	# install our library
+	install -v -m 0755 -o root -g root ${file} ${BINDIR}/${dest} || die
+
+	# prefer scanelf
+	if [[ -x $(type -P scanelf) ]]
+	then
+		local soname="$(scanelf -qBF '%S#p' ${file})"
+		ln ${verbose} -snf $(basename ${file}) ${BINDIR}/${dest}/${soname} || die
+	else
+		echo -e "${COLYELLOW}minstalllib(): Warning: scanelf not found, using fallback symlink method${COLDEFAULT}"
+
+		# create libtool symlinks
+		# 1. - library.so.1.0.0 -> library.so.1.0
+		if [ "${file%.*}" != *.so ]
+		then
+			ln ${verbose} -snf $(basename ${file}) ${BINDIR}/${dest}/$(basename ${file%.*}) || die
+		fi
+		# 2. - library.so.1.0.0 -> library.so.1
+		if [ "${file%.*.*}" != *.so ]
+		then
+			ln ${verbose} -snf $(basename ${file}) ${BINDIR}/${dest}/$(basename ${file%.*.*}) || die
+		fi
+		# 3. - library.so.1.0.0.0 -> library.so.1
+		if [ "${file%.*.*.*}" != *.so ]
+		then
+			ln ${verbose} -snf $(basename ${file}) ${BINDIR}/${dest}/$(basename ${file%.*.*.*}) || die
+		fi
+	fi
 }
 
 # installs environment files
@@ -146,153 +252,6 @@
 	install -v -m 0644 -o root -g root ${file} ${BINDIR}/${destdir}/${etcfile} || die
 }
 
-minstalludevrule()
-{
-	local udevrule
-	local file
-	local udevrulesddir="/usr/lib/udev/rules.d"
-
-	[[ -z "$1" ]] && die "No udev rule given"
-
-	# if no fullpath given use file from sourcedir
-	if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
-	then
-		file="${SOURCEDIR}/$(mpname)/$1"
-	else
-		file="$1"
-	fi
-
-	if [[ -n "$2" ]]
-	then
-		udevrule="$2"
-	else
-		udevrule="$(basename ${file})"
-	fi
-
-	# needed directory
-	install -d ${BINDIR}${udevrulesddir} || die
-
-	# install our udev rule
-	install -v -m 0644 -o root -g root ${file} ${BINDIR}${udevrulesddir}/${udevrule} || die
-}
-
-minstalludevhelper()
-{
-	local udevhelper
-	local file
-	local udevdir="/usr/lib/udev"
-
-	[[ -z "$1" ]] && die "No udev helper given"
-
-	# if no fullpath given use file from sourcedir
-	if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
-	then
-		file="${SOURCEDIR}/$(mpname)/$1"
-	else
-		file="$1"
-	fi
-
-	if [[ -n "$2" ]]
-	then
-		udevhelper="$2"
-	else
-		udevhelper="$(basename ${file})"
-	fi
-
-	# needed directory
-	install -d ${BINDIR}${udevdir} || die
-
-	# install our udev-helper
-	install -v -m 0755 -o root -g root ${file} ${BINDIR}${udevdir}/${udevhelper} || die
-}
-
-minstallhalinformation()
-{
-	local halrule
-	local file
-
-	[[ -z "$1" ]] && die "No hal rule given"
-
-	# if no fullpath given use file from sourcedir
-	if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
-	then
-		file="${SOURCEDIR}/$(mpname)/$1"
-	else
-		file="$1"
-	fi
-
-	if [[ -n "$2" ]]
-	then
-		halrule="$2"
-	else
-		halrule="$(basename ${file})"
-	fi
-
-	# needed directory
-	install -d ${BINDIR}/usr/share/hal/fdi/information/20thirdparty || die
-
-	# install our udev rule
-	install -v -m 0644 -o root -g root ${file} ${BINDIR}/usr/share/hal/fdi/information/20thirdparty/${halrule} || die
-}
-
-minstallhalpolicy()
-{
-	local halrule
-	local file
-
-	[[ -z "$1" ]] && die "No hal rule given"
-
-	# if no fullpath given use file from sourcedir
-	if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
-	then
-		file="${SOURCEDIR}/$(mpname)/$1"
-	else
-		file="$1"
-	fi
-
-	if [[ -n "$2" ]]
-	then
-		halrule="$2"
-	else
-		halrule="$(basename ${file})"
-	fi
-
-	# needed directory
-	install -d ${BINDIR}/usr/share/hal/fdi/policy/20thirdparty || die
-
-	# install our udev rule
-	install -v -m 0644 -o root -g root ${file} ${BINDIR}/usr/share/hal/fdi/policy/20thirdparty/${halrule} || die
-}
-
-minstallhalpreprobe()
-{
-	local halrule
-	local file
-
-	[[ -z "$1" ]] && die "No hal rule given"
-
-	# if no fullpath given use file from sourcedir
-	if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
-	then
-		file="${SOURCEDIR}/$(mpname)/$1"
-	else
-		file="$1"
-	fi
-
-	if [[ -n "$2" ]]
-	then
-		halrule="$2"
-	else
-		halrule="$(basename ${file})"
-	fi
-
-	# needed directory
-	install -d ${BINDIR}/usr/share/hal/fdi/preprobe/10osvendor || die
-
-	# install our udev rule
-	install -v -m 0644 -o root -g root ${file} ${BINDIR}/usr/share/hal/fdi/preprobe/10osvendor/${halrule} || die
-}
-
 # install man files to appropiate dirs
 # minstallman /path/to/manfile.foo
 minstallman()
@@ -500,149 +459,6 @@
 	install -v -m 0644 -o root -g root ${file} ${BINDIR}/etc/logrotate.d/${logfile} || die
 }
 
-
-# installs given directories
-# minstalldir /path/to/dest/dir {/path/to/dest/dirN}
-minstalldir()
-{
-	local argv="$@"
-	local dest
-
-	[[ -z ${argv} ]] && die "No dest dir given"
-	for dest in ${argv}
-	do
-		[[ -d ${BINDIR}${dest} ]] && continue
-		install -v -d ${BINDIR}/${dest} || die
-	done
-}
-
-
-# install files to given path (defaults to /usr/bin)
-# minstallfile {-s} /path/to/file {/path/to/dest}
-minstallfile()
-{
-	local file
-	local dest
-
-	[[ -z $1 ]] && die "No etc file given"
-
-	if [[ $1 = -s ]]
-	then
-		file="${SOURCEDIR}/$(mpname)/$2"
-		dest="$3"
-		if [[ -z $3 ]]
-		then
-			dest=/usr/bin
-			install -d ${BINDIR}/${dest} || die
-		fi
-	else
-		file="$1"
-		dest="$2"
-		if [[ -z $2 ]]
-		then
-			dest=/usr/bin
-			install -d ${BINDIR}/${dest} || die
-		fi
-	fi
-
-	# install our configfile
-	install -v -m 0644 -o root -g root ${file} ${BINDIR}/${dest} || die
-}
-
-# installs executables to given path
-# minstallexec {-s} /path/to/exec {/path/to/dest}
-minstallexec()
-{
-	local file
-	local dest
-
-	[[ -z $1 ]] && die "No file given"
-
-	if [[ $1 = -s ]]
-	then
-		file="${SOURCEDIR}/$(mpname)/$2"
-		dest="$3"
-		if [[ -z $3 ]]
-		then
-			dest=/usr/bin
-			install -d ${BINDIR}/${dest} || die
-		fi
-	else
-		file="$1"
-		dest="$2"
-		if [[ -z $2 ]]
-		then
-			dest=/usr/bin
-			install -d ${BINDIR}/${dest} || die
-		fi
-	fi
-
-	# install our configfile
-	install -v -m 0755 -o root -g root ${file} ${BINDIR}/${dest} || die
-}
-
-# installs executables to given path
-# minstalllib {-s} /path/to/exec {/path/to/dest}
-minstalllib()
-{
-	local file
-	local dest
-	local verbose="-v"
-
-	# check for busybox as it doesn't support 'ln -v'
-	[[ $(readlink $(which ln)) = */busybox ]] && verbose=""
-
-	[[ -z $1 ]] && die "No file given"
-
-	if [[ $1 = -s ]]
-	then
-		file="${SOURCEDIR}/$(mpname)/$2"
-		dest="$3"
-		if [[ -z $3 ]]
-		then
-			dest=/usr/$(mlibdir)
-			install -d ${BINDIR}/${dest} || die
-		fi
-	else
-		file="$1"
-		dest="$2"
-		if [[ -z $2 ]]
-		then
-			dest=/usr/$(mlibdir)
-			install -d ${BINDIR}/${dest} || die
-		fi
-	fi
-
-	# install our library
-	install -v -m 0755 -o root -g root ${file} ${BINDIR}/${dest} || die
-
-	# prefer scanelf
-	if [[ -x $(type -P scanelf) ]]
-	then
-		local soname="$(scanelf -qBF '%S#p' ${file})"
-		ln ${verbose} -snf $(basename ${file}) ${BINDIR}/${dest}/${soname} || die
-	else
-		echo -e "${COLYELLOW}minstalllib(): Warning: scanelf not found, using fallback symlink method${COLDEFAULT}"
-
-		# create libtool symlinks
-		# 1. - library.so.1.0.0 -> library.so.1.0
-		if [ "${file%.*}" != *.so ]
-		then
-			ln ${verbose} -snf $(basename ${file}) ${BINDIR}/${dest}/$(basename ${file%.*}) || die
-		fi
-		# 2. - library.so.1.0.0 -> library.so.1
-		if [ "${file%.*.*}" != *.so ]
-		then
-			ln ${verbose} -snf $(basename ${file}) ${BINDIR}/${dest}/$(basename ${file%.*.*}) || die
-		fi
-		# 3. - library.so.1.0.0.0 -> library.so.1
-		if [ "${file%.*.*.*}" != *.so ]
-		then
-			ln ${verbose} -snf $(basename ${file}) ${BINDIR}/${dest}/$(basename ${file%.*.*.*}) || die
-		fi
-	fi
-}
-
 mcopy()
 {
 	local source="$1"
@@ -683,6 +499,13 @@
 	local dest="$1"
 	local opts
 
+	# enforce
+	if [[ $1 = -f ]]
+	then
+		opts="-f"
+		dest="$2"
+	fi
+
 	# recursive
 	if [[ $1 = -r ]] || [[ $1 = -R ]]
 	then
@@ -698,11 +521,15 @@
 	fi
 
 	[[ -z ${dest} ]] && die "No dest given."
-	if [[ ! -e ${BINDIR}/${dest} ]] || [[ ! -L ${BINDIR}/${dest} ]]
-		die "${BINDIR}/${dest} does not exist."
-	if
-
-	rm -v ${opts} ${BINDIR}/${dest} || die
+	for i in $(eval echo "${BINDIR}/${dest}")
+	do
+		if [[ -e ${i} ]] || [[ -L ${i} ]]
+		then
+			rm -v ${opts} ${i} || die
+		else
+			die "${i} does not exist."
+		fi
+	done
 }
 
 mmove()
@@ -806,69 +633,6 @@
 	ln ${verbose} -snf ${symlink} ${BINDIR}/${pathto} || die
 }
 
-# installs systemd units
-# minstallunit /path/to/unit-file {destfilename}
-minstallunit()
-{
-	local unit
-	local file
-	local systemdunitdir="/usr/lib/systemd/system"
-
-	[[ -z "$1" ]] && die "No unit given"
-
-	# if no fullpath given use file from sourcedir
-	if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
-	then
-		file="${SOURCEDIR}/$(mpname)/$1"
-	else
-		file="$1"
-	fi
-
-	if [[ -n "$2" ]]
-	then
-		unit="$2"
-	else
-		unit="$(basename ${file})"
-	fi
-
-	# needed directory
-	install -d ${BINDIR}${prefix}${systemdunitdir} || die
-
-	# install our initscript
-	install -v -m 0644 -o root -g root ${file} ${BINDIR}${prefix}${systemdunitdir}/${unit} || die
-}
-
-# installs systemd tmp configs to /etc/tmpfiles.d
-# minstalltmp /path/to/tmpdfile {destfilename}
-minstalltmp()
-{
-	local tmpdfile
-	local file
-
-	[[ -z "$1" ]] && die "No tmpd file given"
-
-	# if no fullpath given use file from sourcedir
-	if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
-	then
-		file="${SOURCEDIR}/$(mpname)/$1"
-	else
-		file="$1"
-	fi
-
-	if [[ -n "$2" ]]
-	then
-		tmpdfile="$2"
-	else
-		tmpdfile="$(basename ${file})"
-	fi
-
-	# needed directory
-	install -d ${BINDIR}/etc/tmpfiles.d || die
-
-	# install our tmpdfile
-	install -v -m 0644 -o root -g root ${file} ${BINDIR}/etc/tmpfiles.d/${tmpdfile} || die
-}
-
 mclearconfig()
 {
 	local confdir
@@ -901,7 +665,7 @@
 		-b|--no-bindir) prefix=""; argv="$2" ;;
 	esac
 
-	[[ -z ${argv} ]] && die "No  argument given!"
+	#[[ -z ${argv} ]] && die "No  argument given!"
 
 	confdir="$(dirname ${MCONFIG})"
 		if [[ ! -d ${prefix}/${confdir} ]]
@@ -910,3 +674,26 @@
 	fi
 	echo "${argv}" >> ${prefix}/${MCONFIG} || die
 }
+
+mfilterflag()
+{
+	local type="$1"
+	local flag="$2"
+	local var
+
+	for var in $(eval echo \${${type}})
+	do
+			case "${var}" in
+					${flag}) continue;;
+					*) echo -n "${var}"' ';;
+			esac
+	done
+	echo
+}
+
+maddflag()
+{
+	local type="$1"
+	local flag="$2"
+	echo "$(eval echo \${${type}}) ${flag}"
+}