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

diff --git a/mbuild.sh b/mbuild.sh
index e102122..1ea10b6 100755
--- 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=
@@ -65,7 +62,10 @@ done
 schangesfile_basename="${schangesfile##*/}"
 packagenameversion="${schangesfile_basename%_*}"
 
-cd "${schangesfile%/*}"
+case "$schangesfile" in
+  */*) cd "${schangesfile%/*}";;
+  *) :;;
+esac
 dcmd cp "${schangesfile##*/}" "$BUILDDIR"
 schangesfile="$schangesfile_basename"
 
@@ -89,7 +89,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"