diff --git a/common-functions b/common-functions index c0b316c..44fc252 100755 --- a/common-functions +++ b/common-functions @@ -188,18 +188,18 @@ service_backup() { dokku_log_fail "Provide AWS credentials or use the --use-iam flag" fi - TMPDIR=$(mktemp -d --tmpdir) - trap 'rm -rf "$TMPDIR" > /dev/null' RETURN INT TERM EXIT + BACKUP_TMPDIR=$(mktemp -d --tmpdir) + trap 'rm -rf "$BACKUP_TMPDIR" > /dev/null' RETURN INT TERM EXIT docker inspect "$ID" &>/dev/null || dokku_log_fail "Service container does not exist" is_container_status "$ID" "Running" || dokku_log_fail "Service container is not running" - (service_export "$SERVICE" >"${TMPDIR}/export") + (service_export "$SERVICE" >"${BACKUP_TMPDIR}/export") # Build parameter list for s3backup tool BACKUP_PARAMETERS="$BACKUP_PARAMETERS -e BUCKET_NAME=$BUCKET_NAME" BACKUP_PARAMETERS="$BACKUP_PARAMETERS -e BACKUP_NAME=${PLUGIN_COMMAND_PREFIX}-${SERVICE}" - BACKUP_PARAMETERS="$BACKUP_PARAMETERS -v ${TMPDIR}:/backup" + BACKUP_PARAMETERS="$BACKUP_PARAMETERS -v ${BACKUP_TMPDIR}:/backup" if [[ -f "$SERVICE_BACKUP_ROOT/AWS_DEFAULT_REGION" ]]; then BACKUP_PARAMETERS="$BACKUP_PARAMETERS -e AWS_DEFAULT_REGION=$(cat "$SERVICE_BACKUP_ROOT/AWS_DEFAULT_REGION")" diff --git a/help-functions b/help-functions index 2bc59af..38d31a0 100755 --- a/help-functions +++ b/help-functions @@ -76,10 +76,10 @@ fn-help-contents() { fn-help-contents-subcommand() { declare SUBCOMMAND="$1" FULL_OUTPUT="$2" - local TMPDIR=$(mktemp -d --tmpdir) - local UNCLEAN_FILE="${TMPDIR}/cmd-unclean" CLEAN_FILE="${TMPDIR}/cmd-clean" + local HELP_TMPDIR=$(mktemp -d --tmpdir) + local UNCLEAN_FILE="${HELP_TMPDIR}/cmd-unclean" CLEAN_FILE="${HELP_TMPDIR}/cmd-clean" local BOLD CMD_OUTPUT CYAN EXAMPLE LIGHT_GRAY NORMAL - trap 'rm -rf "$TMPDIR" > /dev/null' RETURN INT TERM EXIT + trap 'rm -rf "$HELP_TMPDIR" > /dev/null' RETURN INT TERM EXIT rm -rf "$UNCLEAN_FILE" "$CLEAN_FILE" cat "$SUBCOMMAND_ROOT/$SUBCOMMAND" >"$UNCLEAN_FILE"