X-Git-Url: https://git.madduck.net/code/mbuild.git/blobdiff_plain/d954c6cf7388acdf2b79095de89b5a93f6e4f1cf..bc0fe05f73724a39893e01f76db97416b4088152:/sbuild-wrapper.sh

diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh
index 0d561d4..8d00787 100755
--- a/sbuild-wrapper.sh
+++ b/sbuild-wrapper.sh
@@ -10,14 +10,17 @@ set -eu
 ME="${0##*/}"
 
 BUILDDIR="$(mktemp -dt $ME.XXXXXXXX)"
-trap "cd / && rm -R '$BUILDDIR'" 0
+trap "cd /tmp && rm -r '$BUILDDIR'" 0
 
 BUNDLE_DIR="${TMPDIR:-/tmp}"
 TARGET_DIR="$PWD"
-dinstall() {
+copy_back_files() {
   echo "Copying files destined for $1 back to $TARGET_DIR..."
   dcmd cp -v "$2" "$TARGET_DIR"
 }
+dinstall() {
+  copy_back_files "$@"
+}
 print_bundle_location() {
   echo "Bundle available at $@ ."
 }
@@ -51,24 +54,26 @@ usage()
   echo
   echo "Valid options are:"
   cat <<-_eof | column -s\& -t
-	--dist & specify the target distribution (default: sid)
+	--dist & specify the target distribution (default: from changes file)
 	--arch & specify the target architecture (default: $DEB_BUILD_ARCH)
+	-sa & pass --force-orig-source to sbuild
+	-B & do a binary-only build
 	-h|--help & show this output.
 	-V|--version & show version information.
 	_eof
 }
 
+binonly=0
 sbuild_args=
 schangesfile=
 arch=
-dist=
 for opt in "$@"; do
   case "$opt" in
     -h|--help) usage; exit 0;;
     -V|--version) about; exit 0;;
     --arch=*) arch="${opt#--arch=}";;
-    --dist=*) dist="${opt#--dist=}";;
     -sa) sbuild_args="${sbuild_args:+$sbuild_args }--force-orig-source";;
+    -B) binonly=1;;
     --*) sbuild_args="${sbuild_args:+$sbuild_args }$opt";;
     *_source.changes)
       if [ -z "$schangesfile" ]; then
@@ -96,7 +101,8 @@ if [ -z "$schangesfile" ]; then
 fi
 
 [ -z "$arch" ] && arch="$DEB_BUILD_ARCH"
-[ -z "$dist" ] && dist="unstable"
+
+dist="$(sed -ne 's,Distribution: ,,p' "$schangesfile")"
 
 schangesfile_basename="${schangesfile##*/}"
 packagenameversion="${schangesfile_basename%_*}"
@@ -110,17 +116,20 @@ schangesfile="$schangesfile_basename"
 
 cd "$BUILDDIR"
 
-sbuild $sbuild_args --arch="$arch" --arch-all --dist="$dist" --keyid=$KEYID \
+[ "$binonly" = 0 ] && sbuild_args="${sbuild_args:+$sbuild_args }--source --arch-all"
+
+sbuild $sbuild_args --arch="$arch" --dist="$dist" --keyid=$KEYID \
   "$packagenameversion".dsc
 
 changesfile="${packagenameversion}_${arch}.changes"
 
-dinstall "$dist" "$schangesfile"
-dinstall "$dist" "$changesfile"
+mergechanges "$schangesfile" "$changesfile" > temp-combined.changes
+mv temp-combined.changes "$changesfile"
+changestool "$changesfile" updatechecksums
 
-mv "$changesfile" "${changesfile}.binonly"
-mergechanges "$schangesfile" "${changesfile}.binonly" > "$changesfile"
-rm "${changesfile}.binonly" "$schangesfile"
+#sign_changes_file "$changesfile"
+
+dinstall "$dist" "$changesfile"
 
 DATESTR="$(date +%Y.%m.%d.%H%M%S)"
 BUILD_PREFIX="${packagenameversion}_${arch}.${DATESTR}"