From b7e15a8ef6b223fa5195fa9b149dc83764677429 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Fri, 16 Jul 2021 00:00:28 +0200 Subject: river: make spawn command take only one argument Currently the spawn command takes any number of arguments and naively joins them together with spaces before passing them as the single argument of `/bin/sh -c`. This however produces unexpected results as soon as shell quoting gets involved in the arguments passed to spawn. For example, running riverctl spawn foo "bar baz" will execute `/bin/sh -c "foo bar baz"`, unexpectedly splitting bar and baz into separate arguments. To avoid this confusion, make the spawn command take only a single argument, forcing the user to quote properly to spawn multi-argument commands. --- example/init | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'example') diff --git a/example/init b/example/init index ae85914..a00a5b1 100755 --- a/example/init +++ b/example/init @@ -122,22 +122,22 @@ riverctl map passthrough $mod F11 enter-mode normal for mode in normal locked do # Eject the optical drive - riverctl map $mode None XF86Eject spawn eject -T + riverctl map $mode None XF86Eject spawn 'eject -T' # Control pulse audio volume with pamixer (https://github.com/cdemoulins/pamixer) - riverctl map $mode None XF86AudioRaiseVolume spawn pamixer -i 5 - riverctl map $mode None XF86AudioLowerVolume spawn pamixer -d 5 - riverctl map $mode None XF86AudioMute spawn pamixer --toggle-mute + riverctl map $mode None XF86AudioRaiseVolume spawn 'pamixer -i 5' + riverctl map $mode None XF86AudioLowerVolume spawn 'pamixer -d 5' + riverctl map $mode None XF86AudioMute spawn 'pamixer --toggle-mute' # Control MPRIS aware media players with playerctl (https://github.com/altdesktop/playerctl) - riverctl map $mode None XF86AudioMedia spawn playerctl play-pause - riverctl map $mode None XF86AudioPlay spawn playerctl play-pause - riverctl map $mode None XF86AudioPrev spawn playerctl previous - riverctl map $mode None XF86AudioNext spawn playerctl next + riverctl map $mode None XF86AudioMedia spawn 'playerctl play-pause' + riverctl map $mode None XF86AudioPlay spawn 'playerctl play-pause' + riverctl map $mode None XF86AudioPrev spawn 'playerctl previous' + riverctl map $mode None XF86AudioNext spawn 'playerctl next' # Control screen backlight brighness with light (https://github.com/haikarainen/light) - riverctl map $mode None XF86MonBrightnessUp spawn light -A 5 - riverctl map $mode None XF86MonBrightnessDown spawn light -U 5 + riverctl map $mode None XF86MonBrightnessUp spawn 'light -A 5' + riverctl map $mode None XF86MonBrightnessDown spawn 'light -U 5' done # Set repeat rate -- cgit v1.2.3