add my own distribution

[code/mbuild.git] / sbuild-wrapper.sh

diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh
index b96f4268ac98774dd2ba0c3e0eb67b42f06a0cb9..731e1bd78f5051d6fe21491cd140526dd2f87797 100755 (executable)
--- a/sbuild-wrapper.sh
+++ b/sbuild-wrapper.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
 #!/bin/sh
 #

-# mbuild - automate builds with sbuild and dinstall the result
+#  - automate builds with sbuild and dinstall the result

 #
 # Copyright (c) 2008 martin f. krafft <madduck@debian.org>
 # Released under the terms of the Artistic Licence 2.0.
 #
 # Copyright (c) 2008 martin f. krafft <madduck@debian.org>
 # Released under the terms of the Artistic Licence 2.0.


@@ -14,10 +14,16 @@ trap "cd / && rm -R '$BUILDDIR'" 0
 
 BUNDLE_DIR="${TMPDIR:-/tmp}"
 TARGET_DIR="$PWD"
 
 BUNDLE_DIR="${TMPDIR:-/tmp}"
 TARGET_DIR="$PWD"

-dinstall() {
+copy_back_files() {

   echo "Copying files destined for $1 back to $TARGET_DIR..."
   dcmd cp -v "$2" "$TARGET_DIR"
 }
   echo "Copying files destined for $1 back to $TARGET_DIR..."
   dcmd cp -v "$2" "$TARGET_DIR"
 }

+dinstall() {
+  copy_back_files "$@"
+}
+print_bundle_location() {
+  echo "Bundle available at $@ ."
+}

 
 KEYID=
 
 
 KEYID=
 


@@ -112,13 +118,14 @@ sbuild $sbuild_args --arch="$arch" --arch-all --dist="$dist" --keyid=$KEYID \
 
 changesfile="${packagenameversion}_${arch}.changes"
 
 
 changesfile="${packagenameversion}_${arch}.changes"
 

-dinstall "$dist" "$schangesfile"
-dinstall "$dist" "$changesfile"
-

 mv "$changesfile" "${changesfile}.binonly"
 mergechanges "$schangesfile" "${changesfile}.binonly" > "$changesfile"
 rm "${changesfile}.binonly" "$schangesfile"
 
 mv "$changesfile" "${changesfile}.binonly"
 mergechanges "$schangesfile" "${changesfile}.binonly" > "$changesfile"
 rm "${changesfile}.binonly" "$schangesfile"
 

+#TODO sign here
+
+dinstall "$dist" "$changesfile"
+

 DATESTR="$(date +%Y.%m.%d.%H%M%S)"
 BUILD_PREFIX="${packagenameversion}_${arch}.${DATESTR}"
 
 DATESTR="$(date +%Y.%m.%d.%H%M%S)"
 BUILD_PREFIX="${packagenameversion}_${arch}.${DATESTR}"
 


@@ -127,10 +134,11 @@ rm -f current-*
 
 bundle="${BUNDLE_DIR}/${BUILD_PREFIX}".bundle.tar
 tar -chf "$bundle" *
 
 bundle="${BUNDLE_DIR}/${BUILD_PREFIX}".bundle.tar
 tar -chf "$bundle" *

+chmod 644 "$bundle"

 
 rm -r "$BUILDDIR"
 trap - 0
 
 
 rm -r "$BUILDDIR"
 trap - 0
 

-echo "Bundle available at $bundle ."
+print_bundle_location "$bundle"

 
 exit 0
 
 exit 0