From db02f1606e08ee5969677f37a4c8d5660dfa4721 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Thu, 30 Aug 2018 18:04:44 -0400
Subject: Run things with -ex and shellcheck (#4436)

---
 .travis/downstream.d/aws-encryption-sdk.sh      | 2 +-
 .travis/downstream.d/certbot-josepy.sh          | 2 +-
 .travis/downstream.d/certbot.sh                 | 2 +-
 .travis/downstream.d/dynamodb-encryption-sdk.sh | 2 +-
 .travis/downstream.d/paramiko.sh                | 2 +-
 .travis/downstream.d/pyopenssl.sh               | 2 +-
 .travis/downstream.d/twisted.sh                 | 4 ++--
 .travis/downstream.d/urllib3.sh                 | 2 +-
 .travis/install.sh                              | 2 +-
 .travis/run.sh                                  | 9 +++------
 10 files changed, 13 insertions(+), 16 deletions(-)

(limited to '.travis')

diff --git a/.travis/downstream.d/aws-encryption-sdk.sh b/.travis/downstream.d/aws-encryption-sdk.sh
index e478cd8a..7363a83e 100755
--- a/.travis/downstream.d/aws-encryption-sdk.sh
+++ b/.travis/downstream.d/aws-encryption-sdk.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -ex
 
 case "${1}" in
     install)
diff --git a/.travis/downstream.d/certbot-josepy.sh b/.travis/downstream.d/certbot-josepy.sh
index 47de2e29..57e539b2 100755
--- a/.travis/downstream.d/certbot-josepy.sh
+++ b/.travis/downstream.d/certbot-josepy.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -ex
 
 case "${1}" in
     install)
diff --git a/.travis/downstream.d/certbot.sh b/.travis/downstream.d/certbot.sh
index f255600f..78ec7f51 100755
--- a/.travis/downstream.d/certbot.sh
+++ b/.travis/downstream.d/certbot.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -ex
 
 case "${1}" in
     install)
diff --git a/.travis/downstream.d/dynamodb-encryption-sdk.sh b/.travis/downstream.d/dynamodb-encryption-sdk.sh
index a7d3885b..891c616e 100755
--- a/.travis/downstream.d/dynamodb-encryption-sdk.sh
+++ b/.travis/downstream.d/dynamodb-encryption-sdk.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -ex
 
 case "${1}" in
     install)
diff --git a/.travis/downstream.d/paramiko.sh b/.travis/downstream.d/paramiko.sh
index ccba686d..55a89265 100755
--- a/.travis/downstream.d/paramiko.sh
+++ b/.travis/downstream.d/paramiko.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -ex
 
 case "${1}" in
     install)
diff --git a/.travis/downstream.d/pyopenssl.sh b/.travis/downstream.d/pyopenssl.sh
index b95bb280..60fc64f5 100755
--- a/.travis/downstream.d/pyopenssl.sh
+++ b/.travis/downstream.d/pyopenssl.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -ex
 
 case "${1}" in
     install)
diff --git a/.travis/downstream.d/twisted.sh b/.travis/downstream.d/twisted.sh
index cb25027a..2710545f 100755
--- a/.travis/downstream.d/twisted.sh
+++ b/.travis/downstream.d/twisted.sh
@@ -1,10 +1,10 @@
-#!/bin/bash
+#!/bin/bash -ex
 
 case "${1}" in
     install)
         git clone --depth=1 https://github.com/twisted/twisted
         cd twisted
-        pip install -e .[tls,conch,http2]
+        pip install -e ".[tls,conch,http2]"
         ;;
     run)
         cd twisted
diff --git a/.travis/downstream.d/urllib3.sh b/.travis/downstream.d/urllib3.sh
index 8442d1e7..4f5dfafb 100755
--- a/.travis/downstream.d/urllib3.sh
+++ b/.travis/downstream.d/urllib3.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -ex
 
 case "${1}" in
     install)
diff --git a/.travis/install.sh b/.travis/install.sh
index 4debde55..4dc9301e 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -42,7 +42,7 @@ elif [ -n "${LIBRESSL}" ]; then
 fi
 
 if [ -z "${DOWNSTREAM}" ]; then
-    git clone --depth=1 https://github.com/google/wycheproof $HOME/wycheproof
+    git clone --depth=1 https://github.com/google/wycheproof "$HOME/wycheproof"
 fi
 
 pip install virtualenv
diff --git a/.travis/run.sh b/.travis/run.sh
index ca0ddac6..352c252e 100755
--- a/.travis/run.sh
+++ b/.travis/run.sh
@@ -1,7 +1,4 @@
-#!/bin/bash
-
-set -e
-set -x
+#!/bin/bash -ex
 
 if [[ "${TOXENV}" == "pypy" ]]; then
     PYENV_ROOT="$HOME/.pyenv"
@@ -24,10 +21,10 @@ fi
 source ~/.venv/bin/activate
 
 if [ -n "${TOXENV}" ]; then
-    tox -- --wycheproof-root=$HOME/wycheproof
+    tox -- --wycheproof-root="$HOME/wycheproof"
 else
     downstream_script="${TRAVIS_BUILD_DIR}/.travis/downstream.d/${DOWNSTREAM}.sh"
-    if [ ! -x $downstream_script ]; then
+    if [ ! -x "$downstream_script" ]; then
         exit 1
     fi
     $downstream_script install
-- 
cgit v1.2.3