summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEmīls Piņķis <emils@mullvad.net>2018-09-06 12:48:32 +0100
committerEmīls Piņķis <emils@mullvad.net>2018-09-06 12:48:32 +0100
commitc448ca931fddacce052a392614d2d906033ca933 (patch)
treec99d5680141f120ecc6e537af7503b0db45ff70c
parentcd6631606dd3f7264f7cbc57c29350a07440aacb (diff)
parent3af63d2391e3bba9d8c28478a9f9928f7c9c22a3 (diff)
downloadmullvadvpn-c448ca931fddacce052a392614d2d906033ca933.tar.xz
mullvadvpn-c448ca931fddacce052a392614d2d906033ca933.zip
Merge branch 'fix-curl-in-buildscript'
-rwxr-xr-xbuild.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/build.sh b/build.sh
index b1db35e010..c3d06883fb 100755
--- a/build.sh
+++ b/build.sh
@@ -144,11 +144,12 @@ process.stdin.on('end', function () {
JSONRPC_CODE
set -e
-curl -X POST \
+JSONRPC_RESPONSE="$(curl -X POST \
+ --fail \
-H "Content-Type: application/json" \
-d '{"jsonrpc": "2.0", "id": "0", "method": "relay_list"}' \
- https://api.mullvad.net/rpc/ | \
-node -e "$JSONRPC_CODE" > dist-assets/relays.json
+ https://api.mullvad.net/rpc/)"
+echo $JSONRPC_RESPONSE | node -e "$JSONRPC_CODE" > dist-assets/relays.json
echo "Installing JavaScript dependencies..."
cd gui