default dinstall copies files back to $PWD

[code/mbuild.git] / mbuild.sh

diff --git a/mbuild.sh b/mbuild.sh
index b4face425443a7d5c849cc81658990e5070e0946..1ea10b67bd755ff9e9ad4fa8df8df85856c06c4a 100755 (executable)
--- a/mbuild.sh
+++ b/mbuild.sh
@@ -10,12 +10,11 @@ set -eu
 BUILDDIR="$(mktemp -dt mbuild.XXXXXXXX)"
 trap "cd / && rm -R '$BUILDDIR'" 0
 
-BUNDLE_DIR="$BUILDDIR"
+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,9 +29,7 @@ if [ -z "$KEYID" ]; then
   exit 1
 fi
 
-cd "$BUILDDIR"
-
-sbuild_args=--debug
+sbuild_args=
 schangesfile=
 arch=
 dist=
@@ -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"
 
@@ -83,8 +83,14 @@ mv "$changesfile" "${changesfile}.binonly"
 mergechanges "$schangesfile" "${changesfile}.binonly" > "$changesfile"
 rm "${changesfile}.binonly" "$schangesfile"
 
-bundle="$BUNDLEDIR/${packagenameversion}.bundle.tar"
-dcmd tar -cvhf "$bundle" "$changesfile"
+DATESTR="$(date +%Y.%m.%d.%H%M%S)"
+BUILD_PREFIX="${packagenameversion}_${arch}.${DATESTR}"
+
+mv current "${BUILD_PREFIX}".buildlog
+rm -f current-*
+
+bundle="${BUNDLE_DIR}/${BUILD_PREFIX}".bundle.tar
+tar -chf "$bundle" *
 
 rm -r "$BUILDDIR"
 trap - 0