mirror of
https://github.com/dcarrillo/prezto.git
synced 2024-12-22 08:08:00 +00:00
Avoid setting TMPDIR and make sure all modules handle that properly
Fixes #1206
This commit is contained in:
parent
b3c7d21d31
commit
3f556400e7
@ -12,7 +12,7 @@ fi
|
|||||||
|
|
||||||
# Set the default paths to gpg-agent files.
|
# Set the default paths to gpg-agent files.
|
||||||
_gpg_agent_conf="${GNUPGHOME:-$HOME/.gnupg}/gpg-agent.conf"
|
_gpg_agent_conf="${GNUPGHOME:-$HOME/.gnupg}/gpg-agent.conf"
|
||||||
_gpg_agent_env="${TMPDIR:-/tmp}/gpg-agent.env"
|
_gpg_agent_env="${TMPDIR:-/tmp}/gpg-agent.env.$UID"
|
||||||
|
|
||||||
# Start gpg-agent if not started.
|
# Start gpg-agent if not started.
|
||||||
if [[ -z "$GPG_AGENT_INFO" && ! -S "${GNUPGHOME:-$HOME/.gnupg}/S.gpg-agent" ]]; then
|
if [[ -z "$GPG_AGENT_INFO" && ! -S "${GNUPGHOME:-$HOME/.gnupg}/S.gpg-agent" ]]; then
|
||||||
|
@ -61,16 +61,3 @@ export LESS='-F -g -i -M -R -S -w -X -z-4'
|
|||||||
if (( $#commands[(i)lesspipe(|.sh)] )); then
|
if (( $#commands[(i)lesspipe(|.sh)] )); then
|
||||||
export LESSOPEN="| /usr/bin/env $commands[(i)lesspipe(|.sh)] %s 2>&-"
|
export LESSOPEN="| /usr/bin/env $commands[(i)lesspipe(|.sh)] %s 2>&-"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#
|
|
||||||
# Temporary Files
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# Set TMPDIR if the variable is not set/empty or the directory doesn't exist
|
|
||||||
if [[ -z "${TMPDIR}" ]]; then
|
|
||||||
export TMPDIR="/tmp/zsh-${UID}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ! -d "${TMPDIR}" ]]; then
|
|
||||||
mkdir -m 700 "${TMPDIR}"
|
|
||||||
fi
|
|
||||||
|
@ -6,6 +6,6 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
# Ensure that a non-login, non-interactive shell has a defined environment.
|
# Ensure that a non-login, non-interactive shell has a defined environment.
|
||||||
if [[ ( "$SHLVL" -eq 1 && ! -o LOGIN || -z "${TMPDIR}" ) && -s "${ZDOTDIR:-$HOME}/.zprofile" ]]; then
|
if [[ ( "$SHLVL" -eq 1 && ! -o LOGIN ) && -s "${ZDOTDIR:-$HOME}/.zprofile" ]]; then
|
||||||
source "${ZDOTDIR:-$HOME}/.zprofile"
|
source "${ZDOTDIR:-$HOME}/.zprofile"
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user