X-Git-Url: https://git.madduck.net/code/mbuild.git/blobdiff_plain/2d0bda4f59416388f340fc07fa1ff1eecf9f0756..48b5848b78e049fb9ac4d9f28c0fc95bfdd9da87:/mbuild.sh

diff --git a/mbuild.sh b/mbuild.sh
index e102122..b96f426 100755
--- a/mbuild.sh
+++ b/mbuild.sh
@@ -7,15 +7,16 @@
 #
 set -eu
 
-BUILDDIR="$(mktemp -dt mbuild.XXXXXXXX)"
+ME="${0##*/}"
+
+BUILDDIR="$(mktemp -dt $ME.XXXXXXXX)"
 trap "cd / && rm -R '$BUILDDIR'" 0
 
 BUNDLE_DIR="${TMPDIR:-/tmp}"
+TARGET_DIR="$PWD"
 dinstall() {
-  echo "Would install into $1:"
-  for file in $(dcmd echo "$2"); do
-    echo "  $file"
-  done
+  echo "Copying files destined for $1 back to $TARGET_DIR..."
+  dcmd cp -v "$2" "$TARGET_DIR"
 }
 
 KEYID=
@@ -30,7 +31,29 @@ if [ -z "$KEYID" ]; then
   exit 1
 fi
 
-cd "$BUILDDIR"
+DEB_BUILD_ARCH="$(dpkg-architecture -qDEB_BUILD_ARCH)"
+
+about()
+{
+  echo "$ME -- wrapper for sbuild"
+  echo "Copyright © martin f. krafft <madduck@debian.org>"
+  echo "Released under the terms of the Artistic Licence 2.0"
+}
+
+usage()
+{
+  about
+  echo
+  echo "Usage: $ME [options] [sbuild_options] file_source.changes"
+  echo
+  echo "Valid options are:"
+  cat <<-_eof | column -s\& -t
+	--dist & specify the target distribution (default: sid)
+	--arch & specify the target architecture (default: $DEB_BUILD_ARCH)
+	-h|--help & show this output.
+	-V|--version & show version information.
+	_eof
+}
 
 sbuild_args=
 schangesfile=
@@ -38,6 +61,8 @@ 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";;
@@ -62,10 +87,21 @@ for opt in "$@"; do
   esac
 done
 
+if [ -z "$schangesfile" ]; then
+  usage
+  exit 1
+fi
+
+[ -z "$arch" ] && arch="$DEB_BUILD_ARCH"
+[ -z "$dist" ] && dist="unstable"
+
 schangesfile_basename="${schangesfile##*/}"
 packagenameversion="${schangesfile_basename%_*}"
 
-cd "${schangesfile%/*}"
+case "$schangesfile" in
+  */*) cd "${schangesfile%/*}";;
+  *) :;;
+esac
 dcmd cp "${schangesfile##*/}" "$BUILDDIR"
 schangesfile="$schangesfile_basename"
 
@@ -89,7 +125,7 @@ BUILD_PREFIX="${packagenameversion}_${arch}.${DATESTR}"
 mv current "${BUILD_PREFIX}".buildlog
 rm -f current-*
 
-bundle="${BUNDLE_DIR}/${BUILD_PREFIX}".bundle.tar"
+bundle="${BUNDLE_DIR}/${BUILD_PREFIX}".bundle.tar
 tar -chf "$bundle" *
 
 rm -r "$BUILDDIR"