Changeset e561ca7

Timestamp:

Sep 18, 2018, 1:41:51 AM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master

Children:

b3146df

Parents:

3a8f0bf

Message:

scripts/get_waf.sh: verify signature if gpg available

File:

• scripts/get_waf.sh (modified) (2 diffs)

scripts/get_waf.sh

@@ -2 +2 @@
 
 set -e
-set -x
+#set -x
 
 WAFVERSION=2.0.11
 WAFTARBALL=waf-$WAFVERSION.tar.bz2
 WAFURL=https://waf.io/$WAFTARBALL
+WAFUPSTREAMKEY=https://gitlab.com/ita1024/waf/raw/master/utils/pubkey.asc
 
 WAFBUILDDIR=`mktemp -d`
@@ -16 +17 @@
 trap cleanup SIGINT SIGTERM
 
+function download () {
+  ( [[ -n `which wget` ]] && wget -qO $1 $2 ) || ( [[ -n `which curl` ]] && curl -so $1 $2 )
+}
+
+function checkwaf () {
+  download $WAFTARBALL.asc $WAFURL.asc
+  if [[ -z `which gpg` ]]
+  then
+    echo "Warning: gpg not found, not verifying signature for $WAFTARBALL"
+  else
+    download - $WAFUPSTREAMKEY | gpg --import
+    gpg --verify $WAFTARBALL.asc || exit 1
+  fi
+}
+
+function fetchwaf () {
+  download $WAFTARBALL $WAFURL
+  checkwaf
+}
+
 function buildwaf () {
-  pushd $WAFBUILDDIR
-
-  ( which wget > /dev/null && wget -qO $WAFTARBALL $WAFURL ) || ( which curl > /dev/null && curl $WAFURL > $WAFTARBALL )
-
   tar xf $WAFTARBALL
   pushd waf-$WAFVERSION
   NOCLIMB=1 python waf-light --tools=c_emscripten $*
-
   popd
-  popd
-
-  cp -prv $WAFBUILDDIR/waf-$WAFVERSION/waf $PWD
-
-  chmod +x waf
 }
 
+pushd $WAFBUILDDIR
+fetchwaf
 buildwaf
+popd
+
+cp -prv $WAFBUILDDIR/waf-$WAFVERSION/waf $PWD
+chmod +x waf
 
 cleanup