From f804a2dddbca4cf9ff901f9ff6917d2c913ee9b2 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Fri, 1 Mar 2013 18:21:51 +0100 Subject: use download_untar in plymouth.build --- remote/tools/plymouth/plymouth.build | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/remote/tools/plymouth/plymouth.build b/remote/tools/plymouth/plymouth.build index b7302971..31ce3038 100644 --- a/remote/tools/plymouth/plymouth.build +++ b/remote/tools/plymouth/plymouth.build @@ -1,31 +1,23 @@ #!/bin/bash fetch_source() { - if [ ! -e .fetched_source ]; then - # download and extract tarball - [ ! -d src ] && mkdir src - wget -q $URL - TARBALL=`basename $URL` - tar xvf $TARBALL -C src/ - rm $TARBALL - touch .fetched_source - fi + [ ! -e .fetched_source ] && download_untar "$URL" "src/" + touch .fetched_source } build() { - if [ ! -e .built ]; then - - BUILDDIR=$TOOL_DIR/$TOOL/build - - cd src/$VERSION - ./configure --enable-systemd-integration --disable-gtk --prefix="" - make -j5 - [ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR - DESTDIR=$BUILDDIR make install - cd - - touch .built - fi - + if [ ! -e .built ]; then + BUILDDIR=$TOOL_DIR/$TOOL/build + cd src/$VERSION + pinfo "Running configure" + ./configure --enable-systemd-integration --disable-gtk --prefix="" || perror "failed." + pinfo "Running make" + make -j5 || perror "failed" + pinfo "Running make install" + DESTDIR=$BUILDDIR make install || perror "failed" + cd - + touch .built + fi } post_copy() { -- cgit v1.2.3-55-g7522