Skip to content

Commit 6f1ad4c

Browse files
author
Jose Diaz-Gonzalez
committed
fix: do not shadow TMPDIR variable
This enables usage of the plugin with libpam-tmpdir. Refs dokku/dokku#3149
1 parent b703030 commit 6f1ad4c

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

common-functions

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,18 +188,18 @@ service_backup() {
188188
dokku_log_fail "Provide AWS credentials or use the --use-iam flag"
189189
fi
190190

191-
TMPDIR=$(mktemp -d --tmpdir)
192-
trap 'rm -rf "$TMPDIR" > /dev/null' RETURN INT TERM EXIT
191+
BACKUP_TMPDIR=$(mktemp -d --tmpdir)
192+
trap 'rm -rf "$BACKUP_TMPDIR" > /dev/null' RETURN INT TERM EXIT
193193

194194
docker inspect "$ID" &>/dev/null || dokku_log_fail "Service container does not exist"
195195
is_container_status "$ID" "Running" || dokku_log_fail "Service container is not running"
196196

197-
(service_export "$SERVICE" >"${TMPDIR}/export")
197+
(service_export "$SERVICE" >"${BACKUP_TMPDIR}/export")
198198

199199
# Build parameter list for s3backup tool
200200
BACKUP_PARAMETERS="$BACKUP_PARAMETERS -e BUCKET_NAME=$BUCKET_NAME"
201201
BACKUP_PARAMETERS="$BACKUP_PARAMETERS -e BACKUP_NAME=${PLUGIN_COMMAND_PREFIX}-${SERVICE}"
202-
BACKUP_PARAMETERS="$BACKUP_PARAMETERS -v ${TMPDIR}:/backup"
202+
BACKUP_PARAMETERS="$BACKUP_PARAMETERS -v ${BACKUP_TMPDIR}:/backup"
203203

204204
if [[ -f "$SERVICE_BACKUP_ROOT/AWS_DEFAULT_REGION" ]]; then
205205
BACKUP_PARAMETERS="$BACKUP_PARAMETERS -e AWS_DEFAULT_REGION=$(cat "$SERVICE_BACKUP_ROOT/AWS_DEFAULT_REGION")"

help-functions

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ fn-help-contents() {
7676

7777
fn-help-contents-subcommand() {
7878
declare SUBCOMMAND="$1" FULL_OUTPUT="$2"
79-
local TMPDIR=$(mktemp -d --tmpdir)
80-
local UNCLEAN_FILE="${TMPDIR}/cmd-unclean" CLEAN_FILE="${TMPDIR}/cmd-clean"
79+
local HELP_TMPDIR=$(mktemp -d --tmpdir)
80+
local UNCLEAN_FILE="${HELP_TMPDIR}/cmd-unclean" CLEAN_FILE="${HELP_TMPDIR}/cmd-clean"
8181
local BOLD CMD_OUTPUT CYAN EXAMPLE LIGHT_GRAY NORMAL
82-
trap 'rm -rf "$TMPDIR" > /dev/null' RETURN INT TERM EXIT
82+
trap 'rm -rf "$HELP_TMPDIR" > /dev/null' RETURN INT TERM EXIT
8383

8484
rm -rf "$UNCLEAN_FILE" "$CLEAN_FILE"
8585
cat "$SUBCOMMAND_ROOT/$SUBCOMMAND" >"$UNCLEAN_FILE"

0 commit comments

Comments
 (0)