From c7b71b5d929ade62d84277708b0d240d4e9e3c8f Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 2 Feb 2019 13:52:18 -0500 Subject: [PATCH] lint: remove unnecessary negation Also use double-brackets where possible. Fixes SC2236 --- deb.mk | 6 +++--- docs/development/plugin-creation.md | 4 ++-- dokku | 2 +- plugins/common/functions | 2 +- plugins/docker-options/docker-args-deploy | 2 +- plugins/domains/functions | 2 +- plugins/enter/subcommands/default | 4 ++-- plugins/scheduler-docker-local/scheduler-run | 2 +- rpm.mk | 6 +++--- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/deb.mk b/deb.mk index 3fdd1d039..77038aa18 100644 --- a/deb.mk +++ b/deb.mk @@ -95,9 +95,9 @@ deb-herokuish: @echo "#!/usr/bin/env bash" >> /tmp/tmp/post-install @echo "sleep 5" >> /tmp/tmp/post-install @echo "echo 'Importing herokuish into docker (around 5 minutes)'" >> /tmp/tmp/post-install - @echo 'if [[ ! -z $${http_proxy+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install - @echo 'if [[ ! -z $${https_proxy+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install - @echo 'if [[ ! -z $${BUILDARGS+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install + @echo 'if [[ -n $${http_proxy+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install + @echo 'if [[ -n $${https_proxy+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install + @echo 'if [[ -n $${BUILDARGS+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install @echo "sudo docker pull gliderlabs/herokuish:v${HEROKUISH_VERSION} && sudo docker tag gliderlabs/herokuish:v${HEROKUISH_VERSION} gliderlabs/herokuish:latest" >> /tmp/tmp/post-install @echo "-> Creating $(HEROKUISH_PACKAGE_NAME)" diff --git a/docs/development/plugin-creation.md b/docs/development/plugin-creation.md index ae27e8053..66817f2cc 100644 --- a/docs/development/plugin-creation.md +++ b/docs/development/plugin-creation.md @@ -45,7 +45,7 @@ hello_main_cmd() { # Use the following lines to reorder args into "$cmd $DOKKU_APP_NAME $@"" local argv=("$@") [[ ${argv[0]} == "$cmd" ]] && shift 1 - [[ ! -z $DOKKU_APP_NAME ]] && set -- $DOKKU_APP_NAME $@ + [[ -n $DOKKU_APP_NAME ]] && set -- $DOKKU_APP_NAME $@ set -- $cmd $@ ## @@ -73,7 +73,7 @@ hello_world_cmd() { # Use the following lines to reorder args into "$cmd $DOKKU_APP_NAME $@"" local argv=("$@") [[ ${argv[0]} == "$cmd" ]] && shift 1 - [[ ! -z $DOKKU_APP_NAME ]] && set -- $DOKKU_APP_NAME $@ + [[ -n $DOKKU_APP_NAME ]] && set -- $DOKKU_APP_NAME $@ set -- $cmd $@ ## diff --git a/dokku b/dokku index a3f994450..7ef85d3ff 100755 --- a/dokku +++ b/dokku @@ -136,7 +136,7 @@ execute_dokku_cmd() { if [[ "$(readlink -f "$PLUGIN_ENABLED_PATH/${PLUGIN_NAME%%:*}")" == *core-plugins* ]]; then [[ ${argv[0]} == "$PLUGIN_CMD" ]] && shift 1 - if [[ ! -z $DOKKU_APP_NAME ]]; then + if [[ -n $DOKKU_APP_NAME ]]; then if [[ "$PLUGIN_CMD" == config* ]] && [[ ${argv[1]} == "--no-restart" ]]; then shift 1 set -- "--no-restart" "$DOKKU_APP_NAME" "$@" diff --git a/plugins/common/functions b/plugins/common/functions index d99e257fa..d8462f739 100755 --- a/plugins/common/functions +++ b/plugins/common/functions @@ -168,7 +168,7 @@ dokku_container_log_verbose_quiet() { is_valid_app_name() { declare desc="verify app name format" local APP="$1" - [[ ! -n "$APP" ]] && dokku_log_fail "APP must not be null" + [[ -z "$APP" ]] && dokku_log_fail "APP must not be null" if [[ "$APP" =~ ^[a-z].* ]] || [[ "$APP" =~ ^[0-9].* ]]; then if [[ ! $APP =~ [A-Z] ]] && [[ ! $APP =~ [:] ]]; then return 0 diff --git a/plugins/docker-options/docker-args-deploy b/plugins/docker-options/docker-args-deploy index de2ae9e14..29f457ec0 100755 --- a/plugins/docker-options/docker-args-deploy +++ b/plugins/docker-options/docker-args-deploy @@ -32,7 +32,7 @@ docker_args() { local line read -r line || local DONE=true - [[ ! -n "$line" ]] && continue + [[ -z "$line" ]] && continue # shellcheck disable=SC1001 case "$line" in diff --git a/plugins/domains/functions b/plugins/domains/functions index 83d17e8e7..bc9545a8e 100755 --- a/plugins/domains/functions +++ b/plugins/domains/functions @@ -248,7 +248,7 @@ get_default_vhosts() { if ! ([[ "$VHOST" =~ $RE_IPV4 ]] || [[ "$VHOST" =~ $RE_IPV6 ]]); then local SUBDOMAIN=${APP/%\.${VHOST}/} local hostname=$(: | plugn trigger nginx-hostname "$APP" "$SUBDOMAIN" "$VHOST") - if [[ ! -n $hostname ]]; then + if [[ -z $hostname ]]; then if [[ "$APP" == *.* ]] && [[ "$SUBDOMAIN" == "$APP" ]]; then local hostname="${APP/\//-}" else diff --git a/plugins/enter/subcommands/default b/plugins/enter/subcommands/default index 22b27b6d5..a822824ec 100755 --- a/plugins/enter/subcommands/default +++ b/plugins/enter/subcommands/default @@ -25,7 +25,7 @@ enter_default_cmd() { if [[ "$3" == "--container-id" ]]; then local DOKKU_APP_CIDS=($(get_app_container_ids "$APP")) - if [[ ! -n "$4" ]]; then + if [[ -z "$4" ]]; then dokku_log_warn "No container id specified." dokku_log_fail "Available ids for app ($APP): ${DOKKU_APP_CIDS[*]}" fi @@ -38,7 +38,7 @@ enter_default_cmd() { else local DOKKU_APP_CIDS=($(get_app_container_ids "$APP" "$CONTAINER_TYPE")) local ID=${DOKKU_APP_CIDS[0]} - if [[ ! -n $ID ]]; then + if [[ -z $ID ]]; then dokku_log_warn "No containers found for type '$CONTAINER_TYPE'" dokku_log_fail "Available types for app ($APP): ${AVAILABLE_CONTAINER_TYPES[*]}" fi diff --git a/plugins/scheduler-docker-local/scheduler-run b/plugins/scheduler-docker-local/scheduler-run index 3cb68173b..c28318c60 100755 --- a/plugins/scheduler-docker-local/scheduler-run +++ b/plugins/scheduler-docker-local/scheduler-run @@ -46,7 +46,7 @@ scheduler-docker-local-scheduler-run() { PROC_CMD=$(get_cmd_from_procfile "$APP" "$POTENTIAL_PROCFILE_KEY" || echo '') remove_procfile "$APP" - if [ ! -z "$PROC_CMD" ]; then + if [[ -n "$PROC_CMD" ]]; then dokku_log_info1 "Found '$POTENTIAL_PROCFILE_KEY' in Procfile, running that command" set -- "$PROC_CMD" "${@:2}" fi diff --git a/rpm.mk b/rpm.mk index d2b08816b..cb7c975dd 100644 --- a/rpm.mk +++ b/rpm.mk @@ -29,9 +29,9 @@ rpm-herokuish: @echo 'systemctl start docker' >> /tmp/tmp/post-install @echo "sleep 5" >> /tmp/tmp/post-install @echo "echo 'Importing herokuish into docker (around 5 minutes)'" >> /tmp/tmp/post-install - @echo 'if [[ ! -z $${http_proxy+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install - @echo 'if [[ ! -z $${https_proxy+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install - @echo 'if [[ ! -z $${BUILDARGS+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install + @echo 'if [[ -n $${http_proxy+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install + @echo 'if [[ -n $${https_proxy+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install + @echo 'if [[ -n $${BUILDARGS+x} ]]; then echo "See the docker pull docs for proxy configuration"; fi' >> /tmp/tmp/post-install @echo "sudo docker pull gliderlabs/herokuish:v${HEROKUISH_VERSION} && sudo docker tag gliderlabs/herokuish:v${HEROKUISH_VERSION} gliderlabs/herokuish:latest" >> /tmp/tmp/post-install @echo "-> Creating $(HEROKUISH_RPM_PACKAGE_NAME)"