From 8d34cf49ad72e556b88033202f7dde130d80fa74 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 25 Feb 2013 20:13:48 +0100
Subject: Several fixes and improvements:

- return uid and gid again for add_user and add_group
- abort execution if sourcing the .build or .conf file of a module fails
- make sure lightdm user and group exists when building the ldm module
- use tarcopy in all modules if appropriate
---
 remote/tools/dbus/dbus.build | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'remote/tools/dbus')

diff --git a/remote/tools/dbus/dbus.build b/remote/tools/dbus/dbus.build
index 5254497f..83cc8efa 100644
--- a/remote/tools/dbus/dbus.build
+++ b/remote/tools/dbus/dbus.build
@@ -9,25 +9,25 @@ fetch_source() {
 }
 
 build() {
-	BUILDDIR=${TOOL_DIR}/${TOOL}/build
+	BUILDDIR="${TOOL_DIR}/${TOOL}/build"
 
 	COPYLIST="list_dpkg_output"
-	[ -e ${COPYLIST} ] && rm ${COPYLIST}
+	[ -e "${COPYLIST}" ] && rm "${COPYLIST}"
 
 	for FILE in $(dpkg -L dbus | grep -v share/doc | grep -v share/man)
 	do
-        	[ ! -d ${FILE} ] && echo ${FILE} >> ${COPYLIST}
+        	[ ! -d "${FILE}" ] && echo ${FILE} >> "${COPYLIST}"
 	done
 
 	# prepare target dir & copy there
 	[ ! -d ${BUILDDIR} ] && mkdir -p ${BUILDDIR}
-	(tar -cpv $(cat ${COPYLIST}|sort -u) | tar -xpv -C ${BUILDDIR}) &> /dev/null
+	tarcopy "$(cat "${COPYLIST}" | sort -u)" "${BUILDDIR}"
 
 }
 post_copy() {
         # copy static dbus systemd unit files to stage3.2
-  	SYSTEMDDIR=${INIT_DIR}/etc/systemd/system
-	[ ! -d ${SYSTEMDDIR} ] && mkdir -p ${SYSTEMDDIR}
-	cp -r ${TOOL_DIR}/${TOOL}/data/* ${INIT_DIR}
-
+  	SYSTEMDDIR="${INIT_DIR}/etc/systemd/system"
+	mkdir -p "${SYSTEMDDIR}"
+	cp -r "${TOOL_DIR}/${TOOL}/data/"* "${INIT_DIR}" || perror "Copying data/* failed."
 }
+
-- 
cgit v1.2.3-55-g7522