X-Git-Url: https://git.madduck.net/code/mbuild.git/blobdiff_plain/d954c6cf7388acdf2b79095de89b5a93f6e4f1cf..674923e47fbeeedc74084c3774e8c6ef374dff5f:/sbuild-wrapper.sh diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh index 0d561d4..731e1bd 100755 --- a/sbuild-wrapper.sh +++ b/sbuild-wrapper.sh @@ -14,10 +14,13 @@ trap "cd / && rm -R '$BUILDDIR'" 0 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" } +dinstall() { + copy_back_files "$@" +} print_bundle_location() { echo "Bundle available at $@ ." } @@ -115,13 +118,14 @@ sbuild $sbuild_args --arch="$arch" --arch-all --dist="$dist" --keyid=$KEYID \ changesfile="${packagenameversion}_${arch}.changes" -dinstall "$dist" "$schangesfile" -dinstall "$dist" "$changesfile" - 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}"