mrrl-logincaps

commit 10e101ca0a7aa2312ff3bff61851e50676257a3e
parent 49dd7acfe4f2a7cc2d693cef778069ef0c6ed05e
Author: Jan Pobrislo <ccx@webprojekty.cz>
Date:   Wed, 16 Dec 2020 05:28:42 +0100

Fix terminal_exec_socket path
Diffstat:
M
bin/zshaskpass_lock
 | 
5
++---

1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/bin/zshaskpass_lock b/bin/zshaskpass_lock
@@ -47,8 +47,7 @@ if [[ -n $X ]]; then
 	x_container_tmpfs=/run/containers/xsession.$X.$USER
 	x_container_service=/run/service/container.xsession.$X.$USER
 	plumber_fifo=$x_container_tmpfs/run/plumber_fifo
-	terminal_exec_socket=$x_container_tmpfs/exec/urxvt
-	#terminal_el="redirfd -w 1 /dev/null redirfd -w 2 /dev/null s6-sudo ${(qqq)${exec_socket:A}} fdmove 3 0 redirfd -r 0 /dev/null background { urxvt -pty-fd 3 }"
+	terminal_exec_socket=$x_container_tmpfs/run/exec/urxvt
 	terminal_el="redirfd -w 1 /dev/null redirfd -w 2 /dev/null s6-sudo ${(qqq)terminal_exec_socket:A}"
 	terminal_env=rxvt-unicode  # the TERM variable used
 	coproc_args+=( tail -F $x_container_tmpfs/run/uncaught-logs/current )
@@ -90,7 +89,7 @@ setup-plumber-listener() {
 		mkfifo $plumber_fifo || return $?
 	fi
 
-	true >$plumber_fifo &!  # background disowned task to keep the fifo's writing side open until it's opened below
+	: >$plumber_fifo &!  # background disowned task to keep the fifo's writing side open until it's opened below
 	sysopen -o cloexec -u temp_r -r $plumber_fifo || return $?
 	if ! sysopen -o cloexec -u plumb_w -w $plumber_fifo; then
 		exec {temp_r}>&-  # close fd