From d33c03431ad97619fc95c67d1913fea3b588d591 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 8 May 2021 13:25:43 +0200 Subject: [PATCH] chore(develop): better name temporary directories --- shell.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/shell.nix b/shell.nix index 73dd7f849..08a048fb6 100644 --- a/shell.nix +++ b/shell.nix @@ -41,9 +41,9 @@ let if [[ -z "$PGHOST" ]]; then set -xe - pgDir=$(mktemp -d) - pgSockDir=$(mktemp -d) - pgLogFile=$(mktemp) + pgDir=$(mktemp -d --tmpdir=''${XDG_RUNTIME_DIR} postgresql.XXXXXX) + pgSockDir=$(mktemp -d --tmpdir=''${XDG_RUNTIME_DIR} postgresql.sock.XXXXXX) + pgLogFile=$(mktemp --tmpdir=''${XDG_RUNTIME_DIR} postgresql.XXXXXX.log) initdb --no-locale -D ''${pgDir} pg_ctl start -D ''${pgDir} -l ''${pgLogFile} -w -o "-k ''${pgSockDir} -c listen_addresses=''' -c hba_file='${postgresHba}' -c unix_socket_permissions=0700 -c max_connections=9990 -c shared_preload_libraries=pg_stat_statements -c auto_explain.log_min_duration=100ms" psql -h ''${pgSockDir} -f ${postgresSchema} postgres @@ -119,8 +119,8 @@ let [[ -n "''${MINIO_LOGFILE}" ]] && rm -rvf ''${MINIO_LOGFILE} } - export MINIO_DIR=$(mktemp -d) - export MINIO_LOGFILE=$(mktemp --tmpdir minio.XXXXXX.log) + export MINIO_DIR=$(mktemp -d --tmpdir=''${XDG_RUNTIME_DIR} minio.XXXXXX) + export MINIO_LOGFILE=$(mktemp --tmpdir=''${XDG_RUNTIME_DIR} minio.XXXXXX.log) export MINIO_ACCESS_KEY=$(${pkgs.pwgen}/bin/pwgen -s 16 1) export MINIO_SECRET_KEY=$(${pkgs.pwgen}/bin/pwgen -s 32 1)