refactor cleaning up

[code/mbuild.git] / sbuild-wrapper.sh

diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh
index c410dcb18b66f9074bd01c38a471468f4cd4fd8d..4f6224d55eb09d9225dab8ba59f6e8edd6e6d200 100755 (executable)
--- a/sbuild-wrapper.sh
+++ b/sbuild-wrapper.sh
@@ -2,7 +2,7 @@
 #
 #  - automate builds with sbuild and dinstall the result
 #
-# Copyright (c) 2008 martin f. krafft <madduck@debian.org>
+# Copyright (c) 2008–2010 martin f. krafft <madduck@debian.org>
 # Released under the terms of the Artistic Licence 2.0.
 #
 set -eu
@@ -10,7 +10,11 @@ set -eu
 ME="${0##*/}"
 
 BUILDDIR="$(mktemp -dt $ME.XXXXXXXX)"
-trap "cd /tmp && rm -r '$BUILDDIR'" 0
+cleanup() {
+  cd /tmp && rm -r "$BUILDDIR"
+  trap - 1 2 3 4 5 6 7 8 10 11 12 13 14 15
+}
+trap cleanup 1 2 3 4 5 6 7 8 10 11 12 13 14 15
 
 BUNDLE_DIR="${TMPDIR:-/tmp}"
 TARGET_DIR="$PWD"
@@ -119,6 +123,7 @@ esac
 dcmd cp "${schangesfile##*/}" "$BUILDDIR"
 schangesfile="$schangesfile_basename"
 
+OLDPWD="$PWD"
 cd "$BUILDDIR"
 
 dcmd "$dscfile_basename" | while read f; do
@@ -126,9 +131,17 @@ dcmd "$dscfile_basename" | while read f; do
 
   case "$f" in
     *.tar.gz|*.tar.bz2|*.tar.lzma|*.tar.xz)
-      last_version="$(apt-cache madison $packagename | sed -rne "s,.+(\<${upstream_version}[^[:space:]]+).*,\1,p")"
-      echo "I: fetching missing tarball for $upstream_version (from $last_version)…" >&2
-      apt-get --tar-only --only-source source "${packagename}=${last_version}"
+      if [ -f "$OLDPWD/$f" ]; then
+        echo "I: using existing tarball for $upstream_version…" >&2
+        cp $OLDPWD/$f $f
+      else
+        last_version="$(apt-cache madison $packagename | sed -rne "s,.+(\<${upstream_version}[^[:space:]]+).*,\1,p")"
+        echo "I: fetching missing tarball for $upstream_version (from $last_version)…" >&2
+        if ! apt-get --tar-only --only-source source "${packagename}=${last_version}"; then
+          echo "E: I do not know how to obtain the file: $f" >&2
+          exit 1
+        fi
+      fi
       ;;
     *)
       echo "E: I do not know how to obtain the file: $f" >&2
@@ -162,8 +175,7 @@ bundle="${BUNDLE_DIR}/${BUILD_PREFIX}".bundle.tar
 tar -chf "$bundle" *
 chmod 644 "$bundle"
 
-rm -r "$BUILDDIR"
-trap - 0
+cleanup
 
 print_bundle_location "$bundle"