commit 485905e4d352954ec063b42525cd50b23a3be924 parent d4f9a674baed92771222e73cd30d86ce10d73bd9 Author: ccx <ccx@te2000.cz> Date: Mon, 11 Mar 2024 23:21:12 +0000 Determine executable paths dynamically Diffstat:
| M | bin/startsshagent | | | 5 | +++-- |
| M | bin/startsshagent.passfd | | | 4 | ++-- |
| M | home/loginexec | | | 2 | +- |
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/bin/startsshagent b/bin/startsshagent @@ -1,14 +1,15 @@ #!/command/execlineb -s1 +backtick SSH_ASKPASS { which zshaskpass } piperw 5 4 piperw 6 7 fdmove -c 3 0 -s6-env DISPLAY=tty ZSHASKPASS_READFD=6 ZSHASKPASS_WRITEFD=4 SSH_ASKPASS=/home/ccx/bin/zshaskpass +s6-env DISPLAY=tty ZSHASKPASS_READFD=6 ZSHASKPASS_WRITEFD=4 ssh-agent -a $1 fdclose 3 fdclose 4 fdclose 6 unexport ZSHASKPASS_READFD unexport ZSHASKPASS_WRITEFD -if { env DISPLAY=terminal SSH_ASKPASS=/home/ccx/bin/zshaskpass ssh-add -c } +if { env DISPLAY=terminal ssh-add -c } s6-env ZSHASKPASS_PASSFD=7 ZSHASKPASS_PROMPTFD=5 $@ diff --git a/bin/startsshagent.passfd b/bin/startsshagent.passfd @@ -2,13 +2,13 @@ backtick SSH_ASKPASS { which zshaskpass } piperw 5 4 piperw 6 7 -s6-env DISPLAY=tty ZSHASKPASS_READFD=6 ZSHASKPASS_WRITEFD=4 SSH_ASKPASS=/home/ccx/bin/zshaskpass +s6-env DISPLAY=tty ZSHASKPASS_READFD=6 ZSHASKPASS_WRITEFD=4 ssh-agent -a $1 fdclose 4 fdclose 6 unexport ZSHASKPASS_READFD unexport ZSHASKPASS_WRITEFD -if { redirfd -r 0 /dev/null env DISPLAY=pipe SSH_ASKPASS=/home/ccx/bin/zshaskpass ssh-add -c } +if { redirfd -r 0 /dev/null env DISPLAY=pipe ssh-add -c } importas -i LOGINPASS_FD LOGINPASS_FD fdclose $LOGINPASS_FD unexport LOGINPASS_FD diff --git a/home/loginexec b/home/loginexec @@ -12,5 +12,5 @@ if [[ $TTY = /dev/tty[1-4] ]]; then exec startsshagent.passfd /run/user/$UID/ssh_agent.${${TTY#/dev/}//\//.} =zshaskpass_lock else exec ssh-agent -a /run/user/$UID/ssh_agent.${${TTY#/dev/}//\//.} /bin/execlineb -c \ - 'if { redirfd -r 0 /dev/null env DISPLAY=pipe SSH_ASKPASS=/home/ccx/bin/cat_pass_fd ssh-add } zsh -l' + 'if { redirfd -r 0 /dev/null env DISPLAY=pipe SSH_ASKPASS="'$commands[cat_pass_fd]'" ssh-add } zsh -l' fi