diff options
| author | Mark Ferrell <major@homeonderanged.org> | 2012-03-19 10:07:30 -0500 |
|---|---|---|
| committer | Mark Ferrell <major@homeonderanged.org> | 2012-03-19 10:07:30 -0500 |
| commit | a8792184c571cfae0b3e11fe438ec51bdf464c0f (patch) | |
| tree | e26441f52a8ed35713839ca55446d301279c4037 | |
| parent | ac953d7543794a4d24ad053f02a479f01232cde1 (diff) | |
Allow multiple archives in the SOURCE_URI
| -rwxr-xr-x | bin/builder/build-sync | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/bin/builder/build-sync b/bin/builder/build-sync index 5b9c7bc..af8f613 100755 --- a/bin/builder/build-sync +++ b/bin/builder/build-sync @@ -45,8 +45,8 @@ build_sync_http() fi case "${HTTP_FILE}" in - (*.tar.bz2|*.tbz2) - bzip -dc "${BUILDER_SRCDIR}/${HTTP_FILE}" | tar x -C "${S}";; + (*.tar.bz|*.tbz|*.tar.bz2|*.tbz2) + bzip2 -dc "${BUILDER_SRCDIR}/${HTTP_FILE}" | tar x -C "${S}";; (*.tar.[Zz]|*.tz) gzip -dc "${BUILDER_SRCDIR}/${HTTP_FILE}" | tar x -C "${S}";; (*.tar.gz|*.tgz) @@ -80,14 +80,16 @@ if [ -d "${BUILDER_PKGDIR}/${NAME}/source" ]; then fi >> "${L}/sync.log" 2>&1 else # FIXME this stuff needs a lot of work - case "${SOURCE_URI}" in - (svn://*) build_sync_svn "${SOURCE_URI}";; - (git://*) build_sync_git "${SOURCE_URI}";; - (http://*) build_sync_http "${SOURCE_URI}";; - (ftp://*) build_sync_http "${SOURCE_URI}";; - # Everything else is death - (*) die "do not know how to handle '${SOURCE_URI}'" - esac >> "${L}/sync.log" 2>&1 + for url in ${SOURCE_URI}; do + case "${url}" in + (svn://*) build_sync_svn "${url}";; + (git://*) build_sync_git "${url}";; + (http://*) build_sync_http "${url}";; + (ftp://*) build_sync_http "${url}";; + # Everything else is death + (*) die "do not know how to handle '${url}'" + esac >> "${L}/sync.log" 2>&1 + done fi # FIXME wrap up the patch command with something more functional |