only chdir when necessary

[code/mbuild.git] / mbuild.sh

diff --git a/mbuild.sh b/mbuild.sh
index b4face425443a7d5c849cc81658990e5070e0946..fab50d219a68ddc616b08f5a7c6d8ab922f519ca 100755 (executable)
--- a/mbuild.sh
+++ b/mbuild.sh
@@ -10,7 +10,7 @@ set -eu
 BUILDDIR="$(mktemp -dt mbuild.XXXXXXXX)"
 trap "cd / && rm -R '$BUILDDIR'" 0
 
 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
 dinstall() {
   echo "Would install into $1:"
   for file in $(dcmd echo "$2"); do


@@ -30,9 +30,7 @@ if [ -z "$KEYID" ]; then
   exit 1
 fi
 
   exit 1
 fi
 

-cd "$BUILDDIR"
-
-sbuild_args=--debug
+sbuild_args=

 schangesfile=
 arch=
 dist=
 schangesfile=
 arch=
 dist=


@@ -65,7 +63,10 @@ done
 schangesfile_basename="${schangesfile##*/}"
 packagenameversion="${schangesfile_basename%_*}"
 
 schangesfile_basename="${schangesfile##*/}"
 packagenameversion="${schangesfile_basename%_*}"
 

-cd "${schangesfile%/*}"
+case "$schangesfile" in
+  */*) cd "${schangesfile%/*}";;
+  *) :;;
+esac

 dcmd cp "${schangesfile##*/}" "$BUILDDIR"
 schangesfile="$schangesfile_basename"
 
 dcmd cp "${schangesfile##*/}" "$BUILDDIR"
 schangesfile="$schangesfile_basename"
 


@@ -83,8 +84,14 @@ mv "$changesfile" "${changesfile}.binonly"
 mergechanges "$schangesfile" "${changesfile}.binonly" > "$changesfile"
 rm "${changesfile}.binonly" "$schangesfile"
 
 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
 
 rm -r "$BUILDDIR"
 trap - 0