From 6d1944d155b012ccec03b64de5450e5b598774c4 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Fri, 12 Dec 2025 16:15:41 -0500 Subject: [PATCH] Forgot to fix barnard-us, now usernames should work again. --- barnard-ui | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/barnard-ui b/barnard-ui index 3b68fbb..a186e62 100755 --- a/barnard-ui +++ b/barnard-ui @@ -135,10 +135,14 @@ connect() { if [[ -z "$serverName" || "$serverName" == "Go Back" ]]; then return fi - local username="$(grep '^username: .*$' ~/.barnard.yaml 2> /dev/null | cut -d ' ' -f2-)" + local username + username="$(grep -m 1 '^Username = ' ~/.barnard.toml 2> /dev/null | cut -d '=' -f2- | sed "s/^[[:space:]]*//;s/[[:space:]]*$//;s/'//g")" username="${username//[[:space:]]/_}" - username="${username//\"/}" - command barnard -username "${username:-${USER}-${HOSTNAME}}" -server ${mumbleServerList[$serverName]} --fifo ~/.config/barnard/cmd --buffers 16 |& log + if [[ -n "$username" ]]; then + command barnard -username "$username" -server ${mumbleServerList[$serverName]} --fifo ~/.config/barnard/cmd --buffers 16 |& log + else + command barnard -server ${mumbleServerList[$serverName]} --fifo ~/.config/barnard/cmd --buffers 16 |& log + fi } remove-server() {