Repository: incubator-edgent Updated Branches: refs/heads/develop ba7e76f11 -> b8216d5b4
- Updated scripts to work with the slightly different file names now used for release bundles - Disabled the downloading and checking of binary bundles as we are not planning on continuing to distribute them Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/b8216d5b Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/b8216d5b Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/b8216d5b Branch: refs/heads/develop Commit: b8216d5b4f078d52c369a74ce59575832972f19b Parents: ba7e76f Author: Christofer Dutz <christofer.d...@c-ware.de> Authored: Wed Dec 6 09:55:40 2017 +0100 Committer: Christofer Dutz <christofer.d...@c-ware.de> Committed: Wed Dec 6 09:55:40 2017 +0100 ---------------------------------------------------------------------- buildTools/check_sigs.sh | 4 ++-- buildTools/download_edgent_asf.sh | 22 ++++++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b8216d5b/buildTools/check_sigs.sh ---------------------------------------------------------------------- diff --git a/buildTools/check_sigs.sh b/buildTools/check_sigs.sh index 671c746..5a5c96e 100755 --- a/buildTools/check_sigs.sh +++ b/buildTools/check_sigs.sh @@ -55,7 +55,7 @@ function checkFile() { fi HASH=`shasum -p -a 512 "${FILE}" | awk '{print$1}'` - CHECK=`cat "${FILE}.sha"` + CHECK=`cat "${FILE}.sha1"` if [ "$HASH" != "$CHECK" ] then @@ -69,7 +69,7 @@ function checkFile() { } -for bundle in ${BUNDLE_DIR}/*.tgz +for bundle in ${BUNDLE_DIR}/*.tar.gz do checkFile ${bundle} done http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b8216d5b/buildTools/download_edgent_asf.sh ---------------------------------------------------------------------- diff --git a/buildTools/download_edgent_asf.sh b/buildTools/download_edgent_asf.sh index 24a4251..8c045ef 100755 --- a/buildTools/download_edgent_asf.sh +++ b/buildTools/download_edgent_asf.sh @@ -36,6 +36,8 @@ set -e setUsage "`basename $0` [--nquery] [--validate|--nvalidate] <version> [<rc-num>]" handleHelp "$@" +BUILDTOOLS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + NQUERY= if [ "$1" == "--nquery" ]; then NQUERY="--nquery"; shift @@ -92,7 +94,7 @@ function getSignedBundle() { mywget ${1} mywget ${1}.asc mywget ${1}.md5 - mywget ${1}.sha + mywget ${1}.sha1 } mkdir -p ${DST_BASE_DIR} @@ -113,13 +115,13 @@ cd ${DST_VER_DIR} mywget ${URL}/LICENSE mywget ${URL}/README mywget ${URL}/RELEASE_NOTES -getSignedBundle ${URL}/apache-edgent-${VER}-incubating-src.tgz +getSignedBundle ${URL}/apache-edgent-${VER}-incubating-source-release.tar.gz -mkdir binaries -cd binaries -URL=${URL}/binaries -mywget ${URL}/LICENSE -getSignedBundle ${URL}/apache-edgent-${VER}-incubating-bin.tgz +#mkdir binaries +#cd binaries +#URL=${URL}/binaries +#mywget ${URL}/LICENSE +#getSignedBundle ${URL}/apache-edgent-${VER}-incubating-bin.tar.gz echo echo Done Downloading to ${DST_BASE_DIR} @@ -139,6 +141,6 @@ echo echo "Verifying the source bundle signatures..." (set -x; $BUILDTOOLS_DIR/check_sigs.sh ${DST_VER_DIR}) -echo -echo "Verifying the binary bundle signatures..." -(set -x; $BUILDTOOLS_DIR/check_sigs.sh ${DST_VER_DIR}/binaries) +#echo +#echo "Verifying the binary bundle signatures..." +#(set -x; $BUILDTOOLS_DIR/check_sigs.sh ${DST_VER_DIR}/binaries)
