From 0ff9306fbb4eda47859bcf065754e7d76848935f Mon Sep 17 00:00:00 2001
From: Jan Beinke <git@janbeinke.com>
Date: Mon, 3 Feb 2020 02:18:19 +0100
Subject: [PATCH] Fix run-sway script to work with more complex status commands

---
 bin/run-sway | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/run-sway b/bin/run-sway
index 81096cb..ff43f33 100755
--- a/bin/run-sway
+++ b/bin/run-sway
@@ -3,17 +3,18 @@
 set -e
 set -u
 
-readonly default_bar_command="$(swaymsg -t get_bar_config bar-0 | jq --raw-output .status_command)"
 readonly executable_name=qbar
 readonly sway_bar_id=bar-0
 
+readonly default_bar_command="$(swaymsg -t get_bar_config "$sway_bar_id" | jq .status_command)"
+
 stack build
 
 readonly temp_dir=$(mktemp -d)
 readonly stderr=$temp_dir/stderr
 mkfifo $stderr
 
-trap "swaymsg bar $sway_bar_id status_command $default_bar_command; rm -rf $temp_dir" EXIT INT HUP TERM
+trap "swaymsg bar $sway_bar_id status_command '$default_bar_command'; rm -rf $temp_dir" EXIT INT HUP TERM
 
 swaymsg bar $sway_bar_id status_command "exec $(stack path --local-install-root)/bin/$executable_name $@ -- server 2> $stderr"
 
-- 
GitLab