don't use set to guard against pipefail

This commit is contained in:
Michael Hobbs committed 2015-02-11 17:48:55 -08:00
1 parent 870ca86ba6
commit 043b055558
2 files changed
+2 -3

No files matched your search

+1 -1
View File
@@ -2,7 +2,7 @@
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
APP="$1" 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}" RE_IPV4="([0-9]{1,3}[\.]){3}[0-9]{1,3}"
+1 -2
View File
@@ -3,8 +3,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
source "$(dirname $0)/../common/functions" source "$(dirname $0)/../common/functions"
APP="$1"; PORT="$2"; IP="$3" APP="$1"; PORT="$2"; IP="$3"
NO_VHOST=$(dokku config:get $APP NO_VHOST || true)
set +e; NO_VHOST=$(dokku config:get $APP NO_VHOST); set -e
if [[ -n "$NO_VHOST" ]]; then if [[ -n "$NO_VHOST" ]]; then
dokku_log_info1 "NO_VHOST config detected" dokku_log_info1 "NO_VHOST config detected"