silence .zshenv in non-interactive mode to fix git

[dotfiles.git] / base / .zshenv

diff --git a/base/.zshenv b/base/.zshenv
index 58169bc8c0301e47f4b6d685c4c024d1aad779ed..18b4552374fdcf010afd58d75ee61111f1765d6b 100644 (file)
--- a/base/.zshenv
+++ b/base/.zshenv
@@ -42,12 +42,12 @@ if [[ -v _sev_reset_shell || $SHLVL == 1 ]] {
     t=${TMPDIR:-/tmp}/home-$LOGNAME
     h=$HOME/tmp
     if [[ ! -e $t ]] {
     t=${TMPDIR:-/tmp}/home-$LOGNAME
     h=$HOME/tmp
     if [[ ! -e $t ]] {

-        mkdir -m 700 $t > /dev/null 2>&1
+        mkdir -m 700 $t >/dev/null 2>&1

         # TODO: check if dir exists after mkdir
     }
     # allow opaque entries to override link creation
     if [[ ! -e $h ]] {
         # TODO: check if dir exists after mkdir
     }
     # allow opaque entries to override link creation
     if [[ ! -e $h ]] {

-        ln -sf $t $h > /dev/null 2>&1
+        ln -sf $t $h >/dev/null 2>&1

     }
     unset t h
 
     }
     unset t h
 


@@ -65,13 +65,19 @@ if [[ -v _sev_reset_shell || $SHLVL == 1 ]] {
             IFS=$'\0' read -r sock pid <$agentfile
         }
         if [[ -S $sock && $pid > 0 ]] && kill -0 $pid; then
             IFS=$'\0' read -r sock pid <$agentfile
         }
         if [[ -S $sock && $pid > 0 ]] && kill -0 $pid; then

-            echo "Reusing agent pid $pid"
+            [[ -o interactive ]] && echo "Reusing agent pid $pid"

             export SSH_AUTH_SOCK=$sock
             export SSH_AGENT_PID=$pid
         else
             # TODO: ensure ssh-agent path looks legit
             #       to avoid unsafe eval?
             export SSH_AUTH_SOCK=$sock
             export SSH_AGENT_PID=$pid
         else
             # TODO: ensure ssh-agent path looks legit
             #       to avoid unsafe eval?

-            eval `${okc}ssh-agent`
+            # NOTE: no way around doing redirection like this I think
+            e=${okc}ssh-agent
+            if [[ -o interactive ]] {
+                eval `$e`
+            } else {
+                eval `$e` >/dev/null 2>&1
+            }

             echo -n $SSH_AUTH_SOCK$'\0'$SSH_AGENT_PID >!$agentfile
         fi
         unset okc agentfile sock pid
             echo -n $SSH_AUTH_SOCK$'\0'$SSH_AGENT_PID >!$agentfile
         fi
         unset okc agentfile sock pid


@@ -80,12 +86,12 @@ if [[ -v _sev_reset_shell || $SHLVL == 1 ]] {
         export GPG_TTY=$(tty)
         export PINENTRY_USER_DATA=USE_TTY=$((!${+DISPLAY}))
         gpg-connect-agent UPDATESTARTUPTTY /bye >/dev/null 2>&1
         export GPG_TTY=$(tty)
         export PINENTRY_USER_DATA=USE_TTY=$((!${+DISPLAY}))
         gpg-connect-agent UPDATESTARTUPTTY /bye >/dev/null 2>&1

-        gpg-connect-agent /subst /serverpid \
+        [[ -o interactive ]] && gpg-connect-agent /subst /serverpid \

             '/echo GPG agent pid ${get serverpid}' /bye
         [[ ! -v SSH_AUTH_SOCK ]] && \
             export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
     } else {
             '/echo GPG agent pid ${get serverpid}' /bye
         [[ ! -v SSH_AUTH_SOCK ]] && \
             export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
     } else {

-        echo "Pre-existing or remote agent"
+        [[ -o interactive ]] && echo "Pre-existing or remote agent"

     }
 
     ## gpg ssh forwarding
     }
 
     ## gpg ssh forwarding