X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=filesystem%2Fetc%2Fprofile.d%2Fenvironment.sh;h=42513fa5753968109e65e8406da2ce9d1ee24509;hb=9c77c557e60d21caceeef1e78e35b35ed968fca9;hp=f44175267fa78a7175d97ec6780820165861cb81;hpb=103a2e153f844343c359882079936b2521c82f15;p=distro-setup

diff --git a/filesystem/etc/profile.d/environment.sh b/filesystem/etc/profile.d/environment.sh
index f441752..42513fa 100644
--- a/filesystem/etc/profile.d/environment.sh
+++ b/filesystem/etc/profile.d/environment.sh
@@ -77,8 +77,9 @@ if [ -f /etc/fedora-release ]; then
   fi
 fi
 
-# and broken again. see /usr/lib/systemd/user-environment-generators/90gpg-agent
-export GPG_AGENT_INFO=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent:0:1
+# 2020: and broken again. see /usr/lib/systemd/user-environment-generators/90gpg-agent.
+# 2022: not sure exactly what this fixed, but gpg seems to work now without it.
+#export GPG_AGENT_INFO=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent:0:1
 
 # and now trisquel9 + mate + i3 has broken ssh agent. I've had to fix
 # ssh or gpg agent like 10 times in different distros, and once again, i
@@ -125,8 +126,8 @@ done
 if ! test "$SSH_AUTH_SOCK"; then
   if [ "$EUID" = 0 ]; then
     export SSH_AUTH_SOCK=/run/openssh_agent
-  else
-    export SSH_AUTH_SOCK=/run/user/1000/openssh_agent
+  elif [ "$EUID" = 1000 ]; then
+    export SSH_AUTH_SOCK=$HOME/openssh_agent
   fi
 fi