- 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
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 @@
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 @@
}
-for bundle in ${BUNDLE_DIR}/*.tgz
+for bundle in ${BUNDLE_DIR}/*.tar.gz
do
checkFile ${bundle}
done
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 @@
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 @@
mywget ${1}
mywget ${1}.asc
mywget ${1}.md5
- mywget ${1}.sha
+ mywget ${1}.sha1
}
mkdir -p ${DST_BASE_DIR}
@@ -113,13 +115,13 @@
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 "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)