From f3c0c70b22335e900f7593b1beaf36a6a8ed0cc5 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 18 Dec 2018 02:30:11 -0500 Subject: [PATCH] fix: properly check args when calling cleanup globally --- plugins/common/functions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/common/functions b/plugins/common/functions index c96792d51..f6509d2fd 100755 --- a/plugins/common/functions +++ b/plugins/common/functions @@ -227,9 +227,9 @@ get_app_image_name() { get_app_scheduler() { declare desc="fetch the scheduler for a given application" declare APP="$1" - local DOKKU_SCHEDULER + local DOKKU_APP_SCHEDULER DOKKU_GLOBAL_SCHEDULER DOKKU_SCHEDULER - DOKKU_APP_SCHEDULER="$(config_get "$APP" DOKKU_SCHEDULER || true)" + [[ -n "$APP" ]] && DOKKU_APP_SCHEDULER="$(config_get "$APP" DOKKU_SCHEDULER || true)" DOKKU_GLOBAL_SCHEDULER="$(config_get --global DOKKU_SCHEDULER || true)" DOKKU_SCHEDULER=${DOKKU_APP_SCHEDULER:="$DOKKU_GLOBAL_SCHEDULER"} @@ -625,7 +625,7 @@ docker_cleanup() { source "$PLUGIN_AVAILABLE_PATH/config/functions" if [[ "$FORCE_CLEANUP" != "true" ]]; then - [[ -z "$APP" ]] && DOKKU_APP_SKIP_CLEANUP="$(config_get "$APP" DOKKU_SKIP_CLEANUP || true)" + [[ -n "$APP" ]] && DOKKU_APP_SKIP_CLEANUP="$(config_get "$APP" DOKKU_SKIP_CLEANUP || true)" if [[ -n "$DOKKU_SKIP_CLEANUP" ]] || [[ -n "$DOKKU_APP_SKIP_CLEANUP" ]]; then dokku_log_info1 "DOKKU_SKIP_CLEANUP set. Skipping dokku cleanup" return