X-Git-Url: https://git.madduck.net/code/mbuild.git/blobdiff_plain/30ae46aab50796388cc5a4db807c7e3d872ad57c..01940c25279f8f76ec47ee2ea3a7423e9ce74849:/sbuild-wrapper.sh

diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh
index 243587d..b2ced37 100755
--- a/sbuild-wrapper.sh
+++ b/sbuild-wrapper.sh
@@ -54,7 +54,7 @@ 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
@@ -67,13 +67,11 @@ 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";;
@@ -91,7 +89,7 @@ for opt in "$@"; do
       fi
       ;;
     *)
-      echo "E: unknown option: $opt" >&1
+      echo "E: unknown option: $opt" >&2
       exit 1
       ;;
   esac
@@ -103,10 +101,13 @@ 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##*/}"
+packagename="${schangesfile_basename%%_*}"
 packagenameversion="${schangesfile_basename%_*}"
+dscfile_basename="$packagenameversion".dsc
 
 case "$schangesfile" in
   */*) cd "${schangesfile%/*}";;
@@ -117,18 +118,33 @@ schangesfile="$schangesfile_basename"
 
 cd "$BUILDDIR"
 
+dcmd "$dscfile_basename" | while read f; do
+  test -f "$f" && continue
+
+  case "$f" in
+    *.tar.gz) 
+      echo "I: fetching missing tarball: $f" >&2
+      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"