From 043b055558bcaeab955069cb206351e307e7ec38 Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Wed, 11 Feb 2015 17:01:30 -0800 Subject: [PATCH] don't use set to guard against pipefail --- plugins/nginx-vhosts/bind-external-ip | 2 +- plugins/nginx-vhosts/post-deploy | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/nginx-vhosts/bind-external-ip b/plugins/nginx-vhosts/bind-external-ip index d4582b3cd..422ddc2f0 100755 --- a/plugins/nginx-vhosts/bind-external-ip +++ b/plugins/nginx-vhosts/bind-external-ip @@ -2,7 +2,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x APP="$1" -set +e; NO_VHOST=$(dokku config:get $APP NO_VHOST); set -e +NO_VHOST=$(dokku config:get $APP NO_VHOST || true) RE_IPV4="([0-9]{1,3}[\.]){3}[0-9]{1,3}" diff --git a/plugins/nginx-vhosts/post-deploy b/plugins/nginx-vhosts/post-deploy index db457b8c7..c803c980b 100755 --- a/plugins/nginx-vhosts/post-deploy +++ b/plugins/nginx-vhosts/post-deploy @@ -3,8 +3,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x source "$(dirname $0)/../common/functions" APP="$1"; PORT="$2"; IP="$3" - -set +e; NO_VHOST=$(dokku config:get $APP NO_VHOST); set -e +NO_VHOST=$(dokku config:get $APP NO_VHOST || true) if [[ -n "$NO_VHOST" ]]; then dokku_log_info1 "NO_VHOST config detected"