More tweaks (#1301)

Adding the set -e option exposed that setcap was failing (on travis). Since there are calls to setcap in prepare-base and the capabilities aren't even needed on travis, I'm just removing the calls to setcap.
WebThingsIO · Aug 24, 2018 · 5a35427 · 5a35427
1 parent a39c215
commit 5a35427
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/image/build-gateway.sh b/image/build-gateway.sh
@@ -75,10 +75,6 @@ export NVM_DIR="$HOME/.nvm"
 nvm install ${NODE_VERSION}
 nvm use ${NODE_VERSION}
 
-# Allow node and python3 to use the Bluetooth adapter
-sudo setcap cap_net_raw+eip $(eval readlink -f `which node`)
-sudo setcap cap_net_raw+eip $(eval readlink -f `which python3`)
-
 npm install -g yarn
 
 # Build the node modules, cross compiling any native code.

diff --git a/image/image-to-aws.sh b/image/image-to-aws.sh
@@ -46,8 +46,8 @@ image_to_aws() {
   aws s3 cp --acl=public-read "${IMG_FILENAME}.zip.sha256sum" "${AWS_DIR}"
 
   echo "AWS URLs"
-  echo "https://s3-us-west-1.amazonaws.com/mozillagatewayimages/${AWS_DIR}/${IMG_FILENAME}.zip"
-  echo "https://s3-us-west-1.amazonaws.com/mozillagatewayimages/${AWS_DIR}/${IMG_FILENAME}.zip.sha256sum"
+  echo "https://s3-us-west-1.amazonaws.com/mozillagatewayimages/${AWS_SUBDIR}/${IMG_FILENAME}.zip"
+  echo "https://s3-us-west-1.amazonaws.com/mozillagatewayimages/${AWS_SUBDIR}/${IMG_FILENAME}.zip.sha256sum"
 }
 
 ###########################################################################