X-Git-Url: https://git.madduck.net/code/mbuild.git/blobdiff_plain/0a2c4104a6288cded4592c613122a7dc87debe41..86244fc270ae41396fc57e3fd2b782a1cd47f900:/sbuild-wrapper.sh

diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh
index 02edbc2..6b90845 100755
--- a/sbuild-wrapper.sh
+++ b/sbuild-wrapper.sh
@@ -89,7 +89,7 @@ for opt in "$@"; do
       fi
       ;;
     *)
-      echo "E: unknown option: $opt" >&1
+      echo "E: unknown option: $opt" >&2
       exit 1
       ;;
   esac
@@ -105,7 +105,9 @@ fi
 dist="$(sed -ne 's,Distribution: ,,p' "$schangesfile")"
 
 schangesfile_basename="${schangesfile##*/}"
+packagename="${schangesfile_basename%%_*}"
 packagenameversion="${schangesfile_basename%_*}"
+dscfile_basename="$packagenameversion".dsc
 
 case "$schangesfile" in
   */*) cd "${schangesfile%/*}";;
@@ -116,18 +118,30 @@ schangesfile="$schangesfile_basename"
 
 cd "$BUILDDIR"
 
+dcmd "$dscfile_basename" | while read f; do
+  test -f "$f" && continue
+
+  case "$f" in
+    *.tar.gz) apt-get --tar-only --only-source source "$packagename";;
+    *)
+      echo "E: I do not know how to obtain the file: $f" >&2
+      exit 1
+      ;;
+  esac
+done
+
 [ "$binonly" = 0 ] && sbuild_args="${sbuild_args:+$sbuild_args }--source --arch-all"
 
 sbuild $sbuild_args --arch="$arch" --dist="$dist" --keyid=$KEYID \
-  "$packagenameversion".dsc
+  "$dscfile_basename"
 
 changesfile="${packagenameversion}_${arch}.changes"
 
-mv "$changesfile" "${changesfile}.binonly"
-mergechanges "$schangesfile" "${changesfile}.binonly" > "$changesfile"
-rm "${changesfile}.binonly" "$schangesfile"
+mergechanges "$schangesfile" "$changesfile" > temp-combined.changes
+mv temp-combined.changes "$changesfile"
+changestool "$changesfile" updatechecksums
 
-#TODO sign here
+#sign_changes_file "$changesfile"
 
 dinstall "$dist" "$changesfile"