summaryrefslogtreecommitdiffstats
path: root/remote/tools/dbus
diff options
context:
space:
mode:
authorSimon Rettberg2013-02-25 20:13:48 +0100
committerSimon Rettberg2013-02-25 20:13:48 +0100
commit8d34cf49ad72e556b88033202f7dde130d80fa74 (patch)
tree3b73845f6e83f6caa47215173ca1899acc0f262d /remote/tools/dbus
parentfix tarcopy call for base (diff)
downloadtm-scripts-8d34cf49ad72e556b88033202f7dde130d80fa74.tar.gz
tm-scripts-8d34cf49ad72e556b88033202f7dde130d80fa74.tar.xz
tm-scripts-8d34cf49ad72e556b88033202f7dde130d80fa74.zip
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
Diffstat (limited to 'remote/tools/dbus')
-rw-r--r--remote/tools/dbus/dbus.build16
1 files changed, 8 insertions, 8 deletions
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."
}
+