diff options
| author | Jonathan Bauer | 2013-02-27 17:18:55 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2013-02-27 17:18:55 +0100 |
| commit | fd7d5b81d0e2c193bf5ca678e054c216da03f90c (patch) | |
| tree | 0e742a553c62c064f51a701c6ceed500b8c37a9f /remote/tools/dbus | |
| parent | using binutils EVERYWHERE (diff) | |
| parent | Implemented more flexible command line parsing (diff) | |
| download | tm-scripts-fd7d5b81d0e2c193bf5ca678e054c216da03f90c.tar.gz tm-scripts-fd7d5b81d0e2c193bf5ca678e054c216da03f90c.tar.xz tm-scripts-fd7d5b81d0e2c193bf5ca678e054c216da03f90c.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Conflicts:
remote/setup_tools
remote/tools/base/base.build
remote/tools/dbus/dbus.build
Diffstat (limited to 'remote/tools/dbus')
| -rw-r--r-- | remote/tools/dbus/dbus.build | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/remote/tools/dbus/dbus.build b/remote/tools/dbus/dbus.build index 331d49e4..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 -cp $(cat ${COPYLIST}|sort -u) | tar -xp -C ${BUILDDIR} + 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." } + |