From f173a9c272a79ac77dc896ab31cf445c48363956 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 17 Feb 2022 19:36:27 +0000
Subject: [PATCH] dot/e16-bindings, dot/xinitrc: Fix shell quoting for
 `pavucontrol'.

This is a hopeless mess.  Hack around it by invoking a shell explicitly
to do the redirection.  Get `xinitrc' to help by using `eval' to
handle quotes correctly when splitting into words.
---
 dot/e16-bindings | 2 +-
 dot/xinitrc      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dot/e16-bindings b/dot/e16-bindings
index 8c12e38..5d604c8 100644
--- a/dot/e16-bindings
+++ b/dot/e16-bindings
@@ -59,7 +59,7 @@ KeyDown   C5        v wop * th available
 KeyDown   C5        w menus show winops.menu
 KeyDown   C5        x wop * close
 KeyDown   C5        y exec xfce4-find-cursor
-KeyDown   C5 numbersign exec xinitcmd pavucontrol >/dev/null 2>&1
+KeyDown   C5 numbersign exec xinitcmd "sh -c 'pavucontrol >/dev/null 2>&1'"
 KeyDown   C5 apostrophe exec xinitcmd disobedience -u$(realpath $HOME/.disorder/passwd)
 KeyDown   C5 semicolon exec disorder-notify next-config
 KeyDown   C5     plus exec disorder-notify volume-up
diff --git a/dot/xinitrc b/dot/xinitrc
index 4e03412..89105c1 100755
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -441,7 +441,7 @@ EOF
 	eval "${line#!}"
 	;;
       *)
-	set -- $line
+	eval "set -- $line"
 	run bgclients "$@"
 	;;
     esac
-- 
2.11.0