madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

minor updates
authormartin f. krafft <madduck@madduck.net>
Fri, 16 May 2008 10:26:50 +0000 (12:26 +0200)
committermartin f. krafft <madduck@madduck.net>
Fri, 16 May 2008 10:26:50 +0000 (12:26 +0200)
rc
sbuild-wrapper.sh

diff --git a/rc b/rc
index 595d83d..78a4746 100644 (file)
--- a/rc
+++ b/rc
@@ -26,6 +26,8 @@ dinstall() {
     *) echo E: unknown distribution: "$1" >&2; exit 1;;
   esac
 
+  copy_back_files "$@"
+
   GNUPGHOME="$REPREPRO_DIR"/.gnupg \
     reprepro --basedir "$REPREPRO_DIR" include "$dist" "$2" || :
 
@@ -35,6 +37,7 @@ dinstall() {
 print_bundle_location() {
   local file; file="${1##*/}"
   echo "$BASE_URL/bundles/$file"
+  #TODO: files does not work
   echo "$files"
 }
 
index 0d561d4..731e1bd 100755 (executable)
@@ -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}"