Changeset 6452 for trunk/scripts/create-licq-tarball.sh

Timestamp:

07/18/08 06:49:23 (4 months ago)

Author:

erijo

Message:

Show the output from the command if it fails

Files:

• trunk/scripts/create-licq-tarball.sh (modified) (6 diffs)

trunk/scripts/create-licq-tarball.sh

@@ -4 +4 @@
 # Latest version: http://svn.licq.org/svn/trunk/scripts/
 #
-# Copyright (c) 2007 Erik Johansson <erijo@licq.org>
+# Copyright (c) 2007-2008 Erik Johansson <erijo@licq.org>
 # Distributed under the terms of the GNU GPL version 2.
 #
@@ -88 +88 @@
 fi
 
-# Workdir
-TMPDIR=$(mktemp -d) || failed "mktemp -d"
-
 # Remove workdir
 function cleanup()
 {
-   echo "Removing ${TMPDIR}"
-   rm -rf "${TMPDIR}"
+   if [ -n "${TMPDIR}" ]; then
+     echo "Removing ${TMPDIR}"
+     rm -rf "${TMPDIR}"
+     TMPDIR=""
+   fi
 }
 
@@ -101 +101 @@
 function failed()
 {
-   if [ -z $1 ]; then
+   if [ -z "$1" ]; then
       echo "failed"
    else
       echo "$1 failed"
    fi
+   if [ -r "${TMPFILE}" ]; then
+      cat "${TMPFILE}"
+   fi
    cleanup
    exit 1
 }
+
+function abort()
+{
+   echo "Aborted by user"
+   cleanup
+   exit 1
+}
+
+function run()
+{
+   "$@" &> "${TMPFILE}" || failed
+   rm -f "${TMPFILE}"
+}
+
+trap abort SIGHUP SIGINT SIGQUIT
+
+# Workdir/file
+TMPDIR=$(mktemp -d) || failed "mktemp -d"
+TMPFILE="${TMPDIR}/.cmd.out"
 
 SVNREV=$(svn info -r"${LICQREV}" "${REPO}" | grep "^Revision:" | awk '{print $2}') || failed
@@ -120 +142 @@
    if [ -e "$1" ]; then
       echo "$1 already exists"
+      cleanup
       exit 1
    fi
@@ -127 +150 @@
 {
    echo -n "Exporting $1 (r${SVNREV})... "
-   svn export --ignore-externals -r"${SVNREV}" -q "${REPO}/$1" "${LICQDIR}/$2" || failed
+   run svn export --ignore-externals -r"${SVNREV}" "${REPO}/$1" "${LICQDIR}/$2"
    echo "done"
 }
@@ -134 +157 @@
 {
    echo -n "Running make -f $1/Makefile.cvs... "
-   make -C "${LICQDIR}/$1" -f "${LICQDIR}/$1/Makefile.cvs" > /dev/null 2>&1 || failed
+   run make -C "${LICQDIR}/$1" -f "${LICQDIR}/$1/Makefile.cvs"
    rm -rf "${LICQDIR}/$1/autom4te.cache"
    rm -f "${LICQDIR}/$1/Makefile.cvs"