diff options
| author | Simon Rettberg | 2013-02-25 20:13:48 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2013-02-25 20:13:48 +0100 |
| commit | 8d34cf49ad72e556b88033202f7dde130d80fa74 (patch) | |
| tree | 3b73845f6e83f6caa47215173ca1899acc0f262d /remote/tools/xorg | |
| parent | fix tarcopy call for base (diff) | |
| download | tm-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/xorg')
| -rw-r--r-- | remote/tools/xorg/xorg.build | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/remote/tools/xorg/xorg.build b/remote/tools/xorg/xorg.build index 590d0bb0..6ce5747c 100644 --- a/remote/tools/xorg/xorg.build +++ b/remote/tools/xorg/xorg.build @@ -1,37 +1,38 @@ #!/bin/bash install_dependencies() { - echo "No dependencies." + : } fetch_source() { - echo "Extracting from running system..." + : } build() { - BUILDDIR=$TOOL_DIR/$TOOL/build + BUILDDIR="$TOOL_DIR/$TOOL/build" COPYLIST="list_dpkg_output" - [ -e $COPYLIST ] && rm $COPYLIST + [ -e "$COPYLIST" ] && rm "$COPYLIST" for PACKAGE in ${REQUIRED_PACKAGES} do for FILE in $(dpkg -L ${PACKAGE} | grep -v share/doc | grep -v share/man) do - [ ! -d $FILE ] && echo $FILE >> $COPYLIST + [ ! -d $FILE ] && echo $FILE >> "$COPYLIST" done done # prepare target dir & copy there - [ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR - (tar -cpv $(cat $COPYLIST|sort -u) | tar -xpv -C $BUILDDIR) &>/dev/null + mkdir -p "$BUILDDIR" + tarcopy "$(cat "$COPYLIST" | sort -u)" "$BUILDDIR" } post_copy() { - [ ! -d $INIT_DIR/etc/X11 ] && mkdir -p $INIT_DIR/etc/X11 + mkdir -p "$INIT_DIR/etc/X11" [ ! -e ${INIT_DIR}/etc/X11/X ] && ln -s /usr/bin/Xorg ${INIT_DIR}/etc/X11/X - [ ! -d $INIT_DIR/var/lib/xkb ] && mkdir -p $INIT_DIR/var/lib/xkb - cp /var/lib/xkb/server* $INIT_DIR/var/lib/xkb + mkdir -p "$INIT_DIR/var/lib/xkb" + cp /var/lib/xkb/server* "$INIT_DIR/var/lib/xkb/" || perror "Copying /var/lib/xkb/server* to '$INIT_DIR/var/lib/xkb/' failed." } + |
