1 files changed, 6 insertions, 6 deletions

diff --git a/echoz.sh b/echoz.sh
index 9d9f94c..e1ae222 100755
--- a/echoz.sh
+++ b/echoz.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
 set -euf
-thisdir="$(dirname $0)"
+thisdir="$(dirname "$0")"
 pipename="${XDG_RUNTIME_DIR:-/tmp}/echoz-$$.pipe"
 jid="$1"
 password="$2"
-username="$(echo "$jid" | cut -d'@' -f1)"
-domain="$(echo "$jid" | cut -d'@' -f2)"
-srv="$( ( dig +short SRV "_xmpp-client._tcp.$domain" || echo "0 0 5222 $domain" ) | sort -n)"
-host="$(echo "$srv" | cut -d' ' -f4)"
-port="$(echo "$srv" | cut -d' ' -f3)"
+username="$(echo "$jid" | sed 's/@.*//')"
+domain="$(echo "$jid" | sed 's/.*@//')"
+srv="$( ( dig +short SRV "_xmpp-client._tcp.$domain" || echo "0 0 5222 $domain" ) | sort -n | sed 's/[[:digit:]]\+[[:space:]][[:digit:]]\+[[:space:]]//')"
+host="$(echo "$srv" | sed 's/[[:digit:]]\+[[:space:]]//')"
+port="$(echo "$srv" | sed 's/[[:space:]].*//')"
 authstr="$(printf '\0%s\0%s' "$username" "$password" | base64)"
 rm -f "$pipename"
 mkfifo "$pipename"