From ec083fd16c343f8dbe13beb4063928b0100bf396 Mon Sep 17 00:00:00 2001 From: Derek Weitzel Date: Fri, 2 Jun 2017 10:35:44 -0500 Subject: [PATCH 1/2] Fixing docs build --- bin/stashcp2/tests/build_docs.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/stashcp2/tests/build_docs.sh b/bin/stashcp2/tests/build_docs.sh index ac29ab9..d37c0b2 100755 --- a/bin/stashcp2/tests/build_docs.sh +++ b/bin/stashcp2/tests/build_docs.sh @@ -1,7 +1,9 @@ #!/bin/sh -xe -if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then +if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ -z ${encrypted_e92dfea3fdc7_key+x} ]; then + # Check if the environment variables are set + if [ -z ${var+x} ]; then openssl aes-256-cbc -K $encrypted_e92dfea3fdc7_key -iv $encrypted_e92dfea3fdc7_iv -in deploy-key.enc -out deploy-key -d chmod 600 deploy-key eval `ssh-agent -s` From 6d94379da6363c7de52770402ec7bad7a2c29192 Mon Sep 17 00:00:00 2001 From: Derek Weitzel Date: Fri, 2 Jun 2017 10:43:47 -0500 Subject: [PATCH 2/2] Fixing docs build, again --- bin/stashcp2/tests/build_docs.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bin/stashcp2/tests/build_docs.sh b/bin/stashcp2/tests/build_docs.sh index d37c0b2..48fc0b9 100755 --- a/bin/stashcp2/tests/build_docs.sh +++ b/bin/stashcp2/tests/build_docs.sh @@ -1,9 +1,7 @@ #!/bin/sh -xe -if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ -z ${encrypted_e92dfea3fdc7_key+x} ]; then +if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ ! -z ${encrypted_e92dfea3fdc7_key+x} ]; then - # Check if the environment variables are set - if [ -z ${var+x} ]; then openssl aes-256-cbc -K $encrypted_e92dfea3fdc7_key -iv $encrypted_e92dfea3fdc7_iv -in deploy-key.enc -out deploy-key -d chmod 600 deploy-key eval `ssh-agent -s`