]> git.madduck.net Git - code/mbuild.git/blobdiff - sbuild-wrapper.sh

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:

add postbuild hook
[code/mbuild.git] / sbuild-wrapper.sh
index ccb1973d937223382cf8194987e488298adf1770..9ea51b7c81caf8ce4600f36436fe3770fd52073c 100755 (executable)
@@ -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"
@@ -24,6 +28,9 @@ dinstall() {
 print_bundle_location() {
   echo "Bundle available at $@ ."
 }
+postbuild() {
+  :
+}
 
 KEYID=
 
@@ -153,11 +160,7 @@ sbuild $sbuild_args --arch="$arch" --dist="$dist" --keyid=$KEYID \
 
 changesfile="${packagenameversion}_${arch}.changes"
 
-#mergechanges "$schangesfile" "$changesfile" > temp-combined.changes
-#mv temp-combined.changes "$changesfile"
-#changestool "$changesfile" updatechecksums
-
-#sign_changes_file "$changesfile"
+postbuild "$changesfile"
 
 dinstall "$dist" "$changesfile"
 
@@ -171,8 +174,7 @@ bundle="${BUNDLE_DIR}/${BUILD_PREFIX}".bundle.tar
 tar -chf "$bundle" *
 chmod 644 "$bundle"
 
-rm -r "$BUILDDIR"
-trap - 0
+cleanup
 
 print_bundle_location "$bundle"