write error message to stderr

[code/mbuild.git] / sbuild-wrapper.sh

diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh
index c0fc8e6ea45fe819c5110ad85738688cdd8b5cba..3f5a2eee569f50905e860b03ffd9a1b80ff39bd3 100755 (executable)
--- a/sbuild-wrapper.sh
+++ b/sbuild-wrapper.sh
@@ -54,25 +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
@@ -88,7 +89,7 @@ for opt in "$@"; do
       fi
       ;;
     *)
-      echo "E: unknown option: $opt" >&1
+      echo "E: unknown option: $opt" >&2
       exit 1
       ;;
   esac
@@ -100,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%_*}"
@@ -114,16 +116,18 @@ 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"
 
-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"