set defaults for arch and dist

[code/mbuild.git] / mbuild.sh

diff --git a/mbuild.sh b/mbuild.sh
index e102122e002a05c3c97e71710d5d4caf843ae9e1..bca4840ffab6024225028a53657ae4ed4b88a5ee 100755 (executable)
--- a/mbuild.sh
+++ b/mbuild.sh
@@ -11,11 +11,10 @@ BUILDDIR="$(mktemp -dt mbuild.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,8 +29,6 @@ if [ -z "$KEYID" ]; then
   exit 1
 fi
 
-cd "$BUILDDIR"
-
 sbuild_args=
 schangesfile=
 arch=
@@ -62,10 +59,16 @@ for opt in "$@"; do
   esac
 done
 
+[ -z "$arch" ] && arch="$(dpkg-architecture -qDEB_BUILD_ARCH)"
+[ -z "$dist" ] && dist="sid"
+
 schangesfile_basename="${schangesfile##*/}"
 packagenameversion="${schangesfile_basename%_*}"
 
-cd "${schangesfile%/*}"
+case "$schangesfile" in
+  */*) cd "${schangesfile%/*}";;
+  *) :;;
+esac
 dcmd cp "${schangesfile##*/}" "$BUILDDIR"
 schangesfile="$schangesfile_basename"
 
@@ -89,7 +92,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"