diff --git a/plugins/app-json/internal-functions b/plugins/app-json/internal-functions index 1d2dc2341..dbb723b9b 100755 --- a/plugins/app-json/internal-functions +++ b/plugins/app-json/internal-functions @@ -10,7 +10,7 @@ get_phase_script() { declare IMAGE_TAG="$1" PHASE_SCRIPT_KEY="$2" local GET_PHASE_SCRIPT_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_get_phase_script.XXXX") local APP_JSON_FILE="$GET_PHASE_SCRIPT_TMP_WORK_DIR/app.json" - trap 'rm -rf "$GET_PHASE_SCRIPT_TMP_WORK_DIR" >/dev/null' RETURN INT TERM + trap "rm -rf '$GET_PHASE_SCRIPT_TMP_WORK_DIR' >/dev/null" RETURN INT TERM copy_from_image "$IMAGE" "app.json" "$GET_PHASE_SCRIPT_TMP_WORK_DIR" 2>/dev/null || true @@ -26,7 +26,7 @@ get_release_cmd() { declare APP="$1" IMAGE_TAG="$2" extract_procfile "$APP" "$IMAGE_TAG" >/dev/null - trap 'remove_procfile $APP' RETURN INT TERM EXIT + trap "remove_procfile $APP" RETURN INT TERM EXIT get_cmd_from_procfile "$APP" "release" "5000" } diff --git a/plugins/certs/subcommands/add b/plugins/certs/subcommands/add index a40c2d8f4..cb24c69cc 100755 --- a/plugins/certs/subcommands/add +++ b/plugins/certs/subcommands/add @@ -44,7 +44,7 @@ certs_set() { elif is_tar_import; then local CERTS_SET_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_certs_set.XXXX") pushd "$CERTS_SET_TMP_WORK_DIR" &>/dev/null - trap 'popd &>/dev/null || true; rm -rf $CERTS_SET_TMP_WORK_DIR >/dev/null' RETURN + trap "popd &>/dev/null || true; rm -rf '$CERTS_SET_TMP_WORK_DIR' >/dev/null" RETURN tar xvf - <&0 local CRT_FILE_SEARCH=$(find . -not -path '*/\.*' -type f | grep ".crt$") diff --git a/plugins/certs/subcommands/generate b/plugins/certs/subcommands/generate index 984e74518..a35ef408f 100755 --- a/plugins/certs/subcommands/generate +++ b/plugins/certs/subcommands/generate @@ -15,7 +15,7 @@ certs_generate_cmd() { if [[ ! -f "$APP_SSL_PATH/server.key" ]] && [[ ! -f "$APP_SSL_PATH/server.crt" ]]; then local CERTS_GENERATE_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_certs.XXXXXXXXX") pushd "$CERTS_GENERATE_TMP_WORK_DIR" >/dev/null - trap 'popd &>/dev/null || true; rm -rf "$CERTS_GENERATE_TMP_WORK_DIR" >/dev/null' INT TERM EXIT + trap "popd &>/dev/null || true; rm -rf '$CERTS_GENERATE_TMP_WORK_DIR' >/dev/null" INT TERM EXIT openssl genrsa -out server.key 2048 openssl req -new -key server.key -out server.csr diff --git a/plugins/git/functions b/plugins/git/functions index 922f2d4ea..b46971030 100755 --- a/plugins/git/functions +++ b/plugins/git/functions @@ -32,7 +32,7 @@ git_build_app_repo() { # clean up after ourselves local GIT_BUILD_APP_REPO_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_git.XXXX") - trap 'rm -rf "$GIT_BUILD_APP_REPO_TMP_WORK_DIR" >/dev/null' RETURN INT TERM EXIT + trap "rm -rf '$GIT_BUILD_APP_REPO_TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT local TMP_TAG="dokku/$REV" chmod 755 "$GIT_BUILD_APP_REPO_TMP_WORK_DIR" diff --git a/plugins/nginx-vhosts/functions b/plugins/nginx-vhosts/functions index 7d3a15ea7..0c41d6093 100755 --- a/plugins/nginx-vhosts/functions +++ b/plugins/nginx-vhosts/functions @@ -304,7 +304,7 @@ nginx_build_config() { local NGINX_CONF=$(mktemp --tmpdir="${NGINX_BUILD_CONFIG_TMP_WORK_DIR}" "nginx.conf.XXXXXX") local CUSTOM_NGINX_TEMPLATE="$NGINX_BUILD_CONFIG_TMP_WORK_DIR/$NGINX_TEMPLATE_NAME" # shellcheck disable=SC2086 - trap 'rm -rf $NGINX_CONF $NGINX_BUILD_CONFIG_TMP_WORK_DIR >/dev/null' RETURN INT TERM EXIT + trap "rm -rf '$NGINX_CONF' '$NGINX_BUILD_CONFIG_TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT get_custom_nginx_template "$APP" "$CUSTOM_NGINX_TEMPLATE" 2>/dev/null if [[ -f "$CUSTOM_NGINX_TEMPLATE" ]]; then diff --git a/plugins/nginx-vhosts/internal-functions b/plugins/nginx-vhosts/internal-functions index 2b413c1c3..ff4fa6e1a 100755 --- a/plugins/nginx-vhosts/internal-functions +++ b/plugins/nginx-vhosts/internal-functions @@ -28,7 +28,7 @@ nginx_vhosts_is_valid_nginx_config_func() { declare APP="$1" local VALIDATE_TEMPLATE="$PLUGIN_AVAILABLE_PATH/nginx-vhosts/templates/validate.conf.sigil" local TMP_OUTPUT=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX") - trap 'rm -rf "$TMP_OUTPUT" >/dev/null' RETURN INT TERM EXIT + trap "rm -rf '$TMP_OUTPUT' >/dev/null" RETURN INT TERM EXIT sigil -f "$VALIDATE_TEMPLATE" NGINX_CONF="$DOKKU_ROOT/$APP/nginx.conf" | cat -s >"$TMP_OUTPUT" sudo "$NGINX_LOCATION" -t -c "$TMP_OUTPUT" 2>/dev/null diff --git a/plugins/ps/functions b/plugins/ps/functions index f2de8ed18..b7f4dacb3 100755 --- a/plugins/ps/functions +++ b/plugins/ps/functions @@ -72,7 +72,7 @@ generate_scale_file() { dokku_log_info1_quiet "DOKKU_SCALE file not found in app image. Generating one based on Procfile..." local GENERATE_SCALE_FILE_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_scale.XXXX") - trap 'rm -rf "$GENERATE_SCALE_FILE_TMP_WORK_DIR" >/dev/null' RETURN + trap "rm -rf '$GENERATE_SCALE_FILE_TMP_WORK_DIR' >/dev/null" RETURN if [[ -f $DOKKU_PROCFILE ]]; then while read -r line || [[ -n "$line" ]]; do @@ -99,7 +99,7 @@ set_scale() { shift 1 extract_procfile "$APP" "$IMAGE_TAG" >/dev/null - trap 'remove_procfile $APP' RETURN INT TERM EXIT + trap "remove_procfile $APP" RETURN INT TERM EXIT local SCALE_SETTINGS=("$@") for procscale in "${SCALE_SETTINGS[@]}"; do diff --git a/plugins/scheduler-docker-local/check-deploy b/plugins/scheduler-docker-local/check-deploy index ba136186e..41cb4fe10 100755 --- a/plugins/scheduler-docker-local/check-deploy +++ b/plugins/scheduler-docker-local/check-deploy @@ -99,7 +99,7 @@ scheduler-docker-local-check-deploy() { dokku_log_info2_quiet "end $APP $DOKKU_APP_CONTAINER_TYPE container output" fi } - trap 'checks_check_deploy_cleanup $DOKKU_APP_CONTAINER_ID' RETURN INT TERM EXIT + trap "checks_check_deploy_cleanup $DOKKU_APP_CONTAINER_ID" RETURN INT TERM EXIT if [[ ! -s "${CHECK_DEPLOY_TMP_WORK_DIR}/CHECKS" ]] || [[ "$DOKKU_APP_CONTAINER_TYPE" != "web" ]]; then # We allow custom check for web instances only diff --git a/plugins/scheduler-docker-local/scheduler-inspect b/plugins/scheduler-docker-local/scheduler-inspect index 77916e379..4bfa05c13 100755 --- a/plugins/scheduler-docker-local/scheduler-inspect +++ b/plugins/scheduler-docker-local/scheduler-inspect @@ -14,7 +14,7 @@ scheduler-docker-local-scheduler-inspect() { fi local TMP_INSPECT_CMD=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX") - trap 'rm -rf "$TMP_INSPECT_CMD" >/dev/null' RETURN INT TERM EXIT + trap "rm -rf '$TMP_INSPECT_CMD' >/dev/null" RETURN INT TERM EXIT cat >"$TMP_INSPECT_CMD" </dev/null' RETURN INT TERM EXIT + trap "rm -rf '$TMP_KEY_FILE' >/dev/null" RETURN INT TERM EXIT while read -r key; do line=$((line + 1)) diff --git a/plugins/ssh-keys/subcommands/add b/plugins/ssh-keys/subcommands/add index 89242b8c3..b533a611c 100755 --- a/plugins/ssh-keys/subcommands/add +++ b/plugins/ssh-keys/subcommands/add @@ -11,7 +11,7 @@ add_keys() { declare NAME="$1" KEY_FILE="$2" local TMP_KEY_FILE TMP_KEY_FILE=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX") - trap 'rm -rf "$TMP_KEY_FILE" >/dev/null' RETURN INT TERM EXIT + trap "rm -rf '$TMP_KEY_FILE' >/dev/null" RETURN INT TERM EXIT if [[ -n "$KEY_FILE" ]]; then true diff --git a/plugins/tar/functions b/plugins/tar/functions index d2c5e6624..a38f46633 100755 --- a/plugins/tar/functions +++ b/plugins/tar/functions @@ -12,7 +12,7 @@ tar_build() { # clean up after ourselves local TAR_BUILD_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_tar.XXXX") - trap 'rm -rf "$TAR_BUILD_TMP_WORK_DIR" >/dev/null' RETURN INT TERM EXIT + trap "rm -rf '$TAR_BUILD_TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT # extract tar file chmod 755 "$TAR_BUILD_TMP_WORK_DIR"