From: martin f. krafft Date: Thu, 15 May 2008 22:28:14 +0000 (+0200) Subject: work on it X-Git-Url: https://git.madduck.net/code/mbuild.git/commitdiff_plain/d954c6cf7388acdf2b79095de89b5a93f6e4f1cf work on it --- diff --git a/rc b/rc index 1d12057..595d83d 100644 --- a/rc +++ b/rc @@ -1,17 +1,19 @@ 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" | \ - while read file section; do + files="$(while read file section; do 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 - done + done)" } dinstall() { @@ -30,9 +32,10 @@ dinstall() { print_repo_paths "$2" } -get_bundle_location() { +print_bundle_location() { local file; file="${1##*/}" echo "$BASE_URL/bundles/$file" + echo "$files" } KEYID=330c4a75 diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh index b96f426..0d561d4 100755 --- a/sbuild-wrapper.sh +++ b/sbuild-wrapper.sh @@ -1,6 +1,6 @@ #!/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 # 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" } +print_bundle_location() { + echo "Bundle available at $@ ." +} KEYID= @@ -127,10 +130,11 @@ rm -f current-* bundle="${BUNDLE_DIR}/${BUILD_PREFIX}".bundle.tar tar -chf "$bundle" * +chmod 644 "$bundle" rm -r "$BUILDDIR" trap - 0 -echo "Bundle available at $bundle ." +print_bundle_location "$bundle" exit 0