]> git.madduck.net Git - code/mbuild.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

refactor cleaning up
authormartin f. krafft <madduck@madduck.net>
Fri, 29 Jan 2010 00:10:55 +0000 (01:10 +0100)
committermartin f. krafft <madduck@madduck.net>
Fri, 29 Jan 2010 03:08:57 +0000 (04:08 +0100)
Signed-off-by: martin f. krafft <madduck@madduck.net>
sbuild-wrapper.sh

index ccb1973d937223382cf8194987e488298adf1770..4f6224d55eb09d9225dab8ba59f6e8edd6e6d200 100755 (executable)
@@ -10,7 +10,11 @@ set -eu
 ME="${0##*/}"
 
 BUILDDIR="$(mktemp -dt $ME.XXXXXXXX)"
 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"
 
 BUNDLE_DIR="${TMPDIR:-/tmp}"
 TARGET_DIR="$PWD"
@@ -171,8 +175,7 @@ bundle="${BUNDLE_DIR}/${BUILD_PREFIX}".bundle.tar
 tar -chf "$bundle" *
 chmod 644 "$bundle"
 
 tar -chf "$bundle" *
 chmod 644 "$bundle"
 
-rm -r "$BUILDDIR"
-trap - 0
+cleanup
 
 print_bundle_location "$bundle"
 
 
 print_bundle_location "$bundle"