From: martin f. krafft <madduck@madduck.net>
Date: Sat, 26 Apr 2008 03:51:19 +0000 (+0400)
Subject: improve bundle creation
X-Git-Url: https://git.madduck.net/code/mbuild.git/commitdiff_plain/2d0bda4f59416388f340fc07fa1ff1eecf9f0756?ds=inline

improve bundle creation
---

diff --git a/mbuild.sh b/mbuild.sh
index b4face4..e102122 100755
--- a/mbuild.sh
+++ b/mbuild.sh
@@ -10,7 +10,7 @@ set -eu
 BUILDDIR="$(mktemp -dt mbuild.XXXXXXXX)"
 trap "cd / && rm -R '$BUILDDIR'" 0
 
-BUNDLE_DIR="$BUILDDIR"
+BUNDLE_DIR="${TMPDIR:-/tmp}"
 dinstall() {
   echo "Would install into $1:"
   for file in $(dcmd echo "$2"); do
@@ -32,7 +32,7 @@ fi
 
 cd "$BUILDDIR"
 
-sbuild_args=--debug
+sbuild_args=
 schangesfile=
 arch=
 dist=
@@ -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