X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/6d54344e74d961369b15acb46cc95ae8da282c79..a7e41770d835323fdf6e74005722473d4cfc446e:/base/.zprofile?ds=sidebyside

diff --git a/base/.zprofile b/base/.zprofile
index 73de480..f611b98 100644
--- a/base/.zprofile
+++ b/base/.zprofile
@@ -25,7 +25,7 @@ function _sev_zcleanup {
     ## gpg forwarding
     if [[ -d $_sev_gpg_forward_dir && ( -z $1 || $1 == 'gpg-forward' ) ]] {
         # clean up forward dirs if its session is dead or we ask for it
-        find $_sev_gpg_forward_dir -type d -mindepth 1 -maxdepth 1 |
+        find $_sev_gpg_forward_dir -mindepth 1 -maxdepth 1 -type d |
           while {read -r x} {
             # NOTE: the only way we can get here is if we have not been
             #       forwarded before, if the user asks for it, or during
@@ -44,13 +44,8 @@ function _sev_zcleanup {
             }
         }
         # reset GNUPGHOME if we removed our own dir
-        if [[ $GNUPGHOME =~ '/.ssh_forward/\d+/*$' && ! -e $GNUPGHOME ]] {
-            x=$GNUPGHOME
-            [[ -o GLOB_ASSIGN ]]; y=$?
-            setopt GLOB_ASSIGN
-            GNUPGHOME=$GNUPGHOME/../..(:a)
-            (( y != 0 )) && unsetopt GLOB_ASSIGN
-        }
+        if [[ $GNUPGHOME =~ '/.ssh_forward/\d+/*$' && ! -e $GNUPGHOME ]]
+            GNUPGHOME=${GNUPGHOME%$MATCH}
     }
 
     ## tmp
@@ -58,7 +53,7 @@ function _sev_zcleanup {
     # NOTE: XDG dirs that use our tmp are not unset here, they are in zlogout
     if [[ -d $_sev_tmp && ( -z $1 || $1 == 'tmp' ) ]] {
         # clean up tmp dirs if its session is dead or we ask for it
-        find $_sev_tmp -name '.session.*' -type d -mindepth 1 -maxdepth 1 |
+        find $_sev_tmp -mindepth 1 -maxdepth 1 -name '.session.*' -type d |
           while {read -r x} {
             # NOTE: same rationale as above
             p=${$(basename $x)#.session.}
@@ -86,10 +81,11 @@ if [[ ! -v _sev_setup_path || -o login ]] {
     typeset -U path fpath
     # add as many generic paths as possible to keep the order we want
     # NOTE: /usr/{local,pkg,games} are unix/bsdisms
+    # XXX: PREFIX not validated, non-posix but Termux uses it
     syspath=("$path[@]")
-    path=({~,~/.local,,/usr,/opt,/usr/local,/usr/pkg}/sbin
-          {~,~/.local,,/usr,/opt,/usr/local,/usr/pkg}/bin
-          /usr/X11R{7,6}/bin /usr/games)
+    path=({~,~/.local,{$PREFIX,}{,/opt,/usr{,/local,pkg}}}/sbin
+          {~,~/.local,{$PREFIX,}{,/opt,/usr{,/local,pkg}}}/bin
+          /usr/{X11R{7,6}/bin,games})
     ((len=$#path))
     path=("$path[@]" "$syspath[@]")
     # remove nonexistent and duplicate paths
@@ -248,8 +244,8 @@ if [[ ! -v _sev_setup_gpg_forward && -v commands[gpg] ]] {
         h=$_sev_gpg_forward_dir/$$
         mkdir -pm700 $h
         # XXX: is it safe to link scdaemon socket? can its name be changed?
-        for x (S.scdaemon gpg.conf gpg-agent.conf sshcontrol
-               pubring.kbx trustdb.gpg private-keys-v1.d crls.d) {
+        for x (S.scdaemon gpg.conf gpg-agent.conf sshcontrol random_seed
+               pubring.kbx{,~} trustdb.gpg private-keys-v1.d crls.d) {
             ln -s ${GNUPGHOME:-~/.gnupg}/$x $h
         }
         export GNUPGHOME=$h
@@ -289,33 +285,39 @@ if [[ -v commands[gpg-connect-agent] && ( ! -v _sev_setup_gpgagent ||
     if {$p} {
         print -nP '%F{blue}>>>%f GPG: '
         if [[ -v _sev_setup_gpg_forward ]] {
-            a=agent
-            print -nP '%F{yellow}Forwarded%f '
-        } else { a=Agent }
-        print -nP '%F{green}'
+            print -nP '%F{yellow}Forwarded agent '
+        } else {
+            print -nP '%F{green}Agent '
+        }
     }
     gpg-connect-agent /bye >/dev/null 2>&1
     if [[ $? -ne 0 ]] {
-        $p && print -P '%F{red}$a communication error'
+        $p && print -P '%F{red}communication error'
     } else {
-        if [[ ${+GPG_TTY} -eq 0 && -o interactive ]]
-            export GPG_TTY=$(tty)
-        if [[ ( -v DISPLAY || -v WAYLAND_DISPLAY ) &&
-              ${PINENTRY_USER_DATA/USE_TTY=0} == $PINENTRY_USER_DATA ]]
-            export PINENTRY_USER_DATA=USE_TTY=$((
-              ${+DISPLAY} + ${+WAYLAND_DISPLAY} == 0))
-        # XXX: don't know if gpg-agent supports comments after directives
-        # XXX: path could have #
-        sed -Ei 's#^([[:space:]]*pinentry-program[[:space:]]).*$#\1'${commands[pinentry]:-/dev/null}'#' \
-          ${GNUPGHOME:-~/.gnupg}/gpg-agent.conf
-        # XXX: could probably check for changes before doing this to save perf
-        gpg-connect-agent RELOADAGENT UPDATESTARTUPTTY /bye >/dev/null 2>&1
-        $p && gpg-connect-agent /subst /serverpid \
-                "/echo $a pid \${get serverpid} on $GPG_TTY" /bye
+        if [[ ! -v _sev_setup_gpg_forward ]] {
+            if [[ ${+GPG_TTY} -eq 0 && -o interactive ]]
+                export GPG_TTY=$(tty)
+            if [[ ( -v DISPLAY || -v WAYLAND_DISPLAY ) &&
+                  ${PINENTRY_USER_DATA/USE_TTY=0} == $PINENTRY_USER_DATA ]]
+                export PINENTRY_USER_DATA=USE_TTY=$((
+                  ${+DISPLAY} + ${+WAYLAND_DISPLAY} == 0))
+            # XXX: don't know if gpg-agent supports comments after directives
+            # XXX: path could have #
+            sed -Ei 's#^([[:space:]]*pinentry-program[[:space:]]).*$#\1'${commands[pinentry]:-/dev/null}'#' \
+              ${GNUPGHOME:-~/.gnupg}/gpg-agent.conf
+            # XXX: could check for changes before doing this to save perf
+            gpg-connect-agent RELOADAGENT UPDATESTARTUPTTY /bye >/dev/null 2>&1
+            if {$p} {
+                gpg-connect-agent /subst /serverpid \
+                  "/echo pid \${get serverpid} on $GPG_TTY" /bye 2>/dev/null
+                print -nP '%f'
+            }
+        } elif {$p} {
+            print -P '%f'
+        }
         export _sev_setup_gpgagent=
     }
-    $p && print -nP '%f'
-    unset p a
+    unset p
 }
 
 ### ssh agent