]> git.madduck.net Git - code/mbuild.git/commitdiff

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:

work on it
authormartin f. krafft <madduck@madduck.net>
Thu, 15 May 2008 22:28:14 +0000 (00:28 +0200)
committermartin f. krafft <madduck@madduck.net>
Thu, 15 May 2008 22:28:14 +0000 (00:28 +0200)
rc
sbuild-wrapper.sh

diff --git a/rc b/rc
index 1d1205729ffd9f98b000b39748431d0b3fc687e8..595d83d84868a1f25581376a8944e573b6d929ec 100644 (file)
--- a/rc
+++ b/rc
@@ -1,17 +1,19 @@
 REPREPRO_DIR=$HOME/reprepro
 BASE_URL=http://debian.madduck.net/repo
 
 REPREPRO_DIR=$HOME/reprepro
 BASE_URL=http://debian.madduck.net/repo
 
+files=
+
 print_repo_paths() {
   local pkg; pkg="${1##*/}"; pkg="${pkg%%_*}"
   local let; let="$(echo "$pkg" | cut -c1)"
 
   sed -rne 's,^[[:space:]]+[[:xdigit:]]+ [[:digit:]]++ (([-[:alpha:]]+)/)?[-_[:alpha:]]+ [[:alpha:]]+ (.+$),\3 \2,p' "$1" | \
 print_repo_paths() {
   local pkg; pkg="${1##*/}"; pkg="${pkg%%_*}"
   local let; let="$(echo "$pkg" | cut -c1)"
 
   sed -rne 's,^[[:space:]]+[[:xdigit:]]+ [[:digit:]]++ (([-[:alpha:]]+)/)?[-_[:alpha:]]+ [[:alpha:]]+ (.+$),\3 \2,p' "$1" | \
-    while read file section; do
+    files="$(while read file section; do
       case "$file" in
         *.diff.gz|*.tar.gz) continue;;
       case "$file" in
         *.diff.gz|*.tar.gz) continue;;
-        *) echo "$BASE_URL/pool/${section:-main}/$let/$pkg/${file##*/}";;
+        *) echo "$BASE_URL/pool/${section:-main}/$let/$pkg/${file##*/}}";;
       esac
       esac
-    done
+    done)"
 }
 
 dinstall() {
 }
 
 dinstall() {
@@ -30,9 +32,10 @@ dinstall() {
   print_repo_paths "$2"
 }
 
   print_repo_paths "$2"
 }
 
-get_bundle_location() {
+print_bundle_location() {
   local file; file="${1##*/}"
   echo "$BASE_URL/bundles/$file"
   local file; file="${1##*/}"
   echo "$BASE_URL/bundles/$file"
+  echo "$files"
 }
 
 KEYID=330c4a75
 }
 
 KEYID=330c4a75
index b96f4268ac98774dd2ba0c3e0eb67b42f06a0cb9..0d561d40b0cc3533e0ebabacd791c4c376d24060 100755 (executable)
@@ -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.
@@ -18,6 +18,9 @@ dinstall() {
   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"
 }
+print_bundle_location() {
+  echo "Bundle available at $@ ."
+}
 
 KEYID=
 
 
 KEYID=
 
@@ -127,10 +130,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