From: sev Date: Sun, 25 Sep 2022 12:14:40 +0000 (-0500) Subject: zprofile: remove unnecessary variable X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/commitdiff_plain/e6e7ad69b69cc308652bbf7cc30c851b35933dc4 zprofile: remove unnecessary variable --- diff --git a/base/.zprofile b/base/.zprofile index 9179bcb..2a26dbb 100644 --- a/base/.zprofile +++ b/base/.zprofile @@ -330,8 +330,7 @@ if [[ ! -v _sev_setup_ssh ]] { if [[ ! -v SSH_AUTH_SOCK && ( -v commands[okc-ssh-agent] || ( -v commands[ssh-agent] && ! -v commands[gpg] ) ) ]] { okc=${commands[okc-ssh-agent]:+okc-} - t=${_sev_tmp:-${TMPDIR:-${TEMP:-${TMP:-/tmp}}}} - e=$t/${okc}ssh-agent-exports + e=$_sev_tmp/${okc}ssh-agent-exports typeset sock= typeset -i pid= if [[ -f $e ]] { @@ -342,20 +341,21 @@ if [[ ! -v _sev_setup_ssh ]] { export SSH_AUTH_SOCK=$sock export SSH_AGENT_PID=$pid else - e='TMPDIR=$t ${okc}ssh-agent' # TODO: ensure ssh-agent path looks legit to avoid unsafe eval? # XXX: doesn't appear to be any other way to handle redirection. # because eval needs to write to current scope environment # subshells can't be used to capture output and print. + c='TMPDIR=$_sev_tmp ${okc}ssh-agent' if [[ -o interactive ]] { - eval $(eval $=e) + eval $(eval $=c) print -nP '%f' } else { - eval $(eval $=e) >/dev/null 2>&1 + eval $(eval $=c) >/dev/null 2>&1 } echo -n $SSH_AUTH_SOCK$'\0'$SSH_AGENT_PID >!$e + unset c fi - unset okc t e sock pid + unset okc e sock pid } elif [[ ! -v SSH_AUTH_SOCK && -v commands[gpg] ]] { # since gpg should have been started above, just export and notify if [[ -o interactive ]] {