From f13c1031c775f418aed8eba5d38ce4df21e29d62 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 16 Nov 2014 02:54:54 -0500 Subject: [PATCH] Ensure there is a newline after calling `set -e` --- plugins/00_dokku-standard/backup-check | 1 + plugins/00_dokku-standard/backup-export | 1 + plugins/00_dokku-standard/backup-import | 1 + plugins/backup/commands | 1 + plugins/checks/check-deploy | 1 + plugins/config/backup-export | 1 + plugins/config/backup-import | 1 + plugins/git/backup-import | 2 ++ plugins/git/commands | 1 + plugins/nginx-vhosts/backup-export | 1 + plugins/nginx-vhosts/backup-import | 1 + plugins/nginx-vhosts/post-delete | 1 + plugins/nginx-vhosts/post-deploy | 1 + 13 files changed, 14 insertions(+) diff --git a/plugins/00_dokku-standard/backup-check b/plugins/00_dokku-standard/backup-check index 91e7bfb51..b80e108f1 100755 --- a/plugins/00_dokku-standard/backup-check +++ b/plugins/00_dokku-standard/backup-check @@ -1,5 +1,6 @@ #!/usr/bin/env bash set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x + VERSION="$1" IMPORT_DIR="$2" TARGET_DIR="$3" diff --git a/plugins/00_dokku-standard/backup-export b/plugins/00_dokku-standard/backup-export index 651d0b3db..8a1fcf24c 100755 --- a/plugins/00_dokku-standard/backup-export +++ b/plugins/00_dokku-standard/backup-export @@ -1,5 +1,6 @@ #!/usr/bin/env bash set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x + VERSION="$1" BASE_DIR="$2" diff --git a/plugins/00_dokku-standard/backup-import b/plugins/00_dokku-standard/backup-import index 86404a99b..23af3913b 100755 --- a/plugins/00_dokku-standard/backup-import +++ b/plugins/00_dokku-standard/backup-import @@ -1,5 +1,6 @@ #!/usr/bin/env bash set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x + VERSION="$1" IMPORT_DIR="$2" TARGET_DIR="$3" diff --git a/plugins/backup/commands b/plugins/backup/commands index 9aa6cdc65..0571ed867 100755 --- a/plugins/backup/commands +++ b/plugins/backup/commands @@ -1,5 +1,6 @@ #!/usr/bin/env bash set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x + CURRENT_BACKUP_VERSION=1 set -e; case "$1" in backup:export) diff --git a/plugins/checks/check-deploy b/plugins/checks/check-deploy index 6db3f6444..e69182990 100755 --- a/plugins/checks/check-deploy +++ b/plugins/checks/check-deploy @@ -14,6 +14,7 @@ # in seconds). set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x + CONTAINERID="$1"; APP="$2"; PORT="$3" ; HOSTNAME="${4:-localhost}" # source in app env to get DOKKU_CHECKS_WAIT and any other necessary vars diff --git a/plugins/config/backup-export b/plugins/config/backup-export index 68b5c0393..bc709ce83 100755 --- a/plugins/config/backup-export +++ b/plugins/config/backup-export @@ -1,5 +1,6 @@ #!/usr/bin/env bash set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x + shopt -s nullglob VERSION="$1" BASE_DIR="$2" diff --git a/plugins/config/backup-import b/plugins/config/backup-import index 9ed3b1eca..22c1d9324 100755 --- a/plugins/config/backup-import +++ b/plugins/config/backup-import @@ -1,5 +1,6 @@ #!/usr/bin/env bash set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x + shopt -s nullglob VERSION="$1" IMPORT_DIR="$2" diff --git a/plugins/git/backup-import b/plugins/git/backup-import index 6d4a30a10..81c169a9d 100755 --- a/plugins/git/backup-import +++ b/plugins/git/backup-import @@ -1,5 +1,6 @@ #!/usr/bin/env bash set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x + VERSION="$1" IMPORT_DIR="$2" TARGET_DIR="$3" @@ -12,6 +13,7 @@ while read APP; do cat > $PRERECEIVE_HOOK < $PRERECEIVE_HOOK < /dev/null diff --git a/plugins/nginx-vhosts/post-deploy b/plugins/nginx-vhosts/post-deploy index 1e0b1e7fe..b0d06e8cb 100755 --- a/plugins/nginx-vhosts/post-deploy +++ b/plugins/nginx-vhosts/post-deploy @@ -1,5 +1,6 @@ #!/usr/bin/env bash set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x + APP="$1"; PORT="$2" WILDCARD_SSL="$DOKKU_ROOT/tls" SSL="$DOKKU_ROOT/$APP/tls"