From 2a388b434b8ba3f065d78fa3a2c1c98f3a35bffc Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Sat, 16 May 2026 11:35:04 +0200
Subject: [PATCH] feat: Improve Dnsmasq error handling (#1149)

---
 src/network.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/network.sh b/src/network.sh
index b8edae4..ecc43af 100644
--- a/src/network.sh
+++ b/src/network.sh
@@ -175,9 +175,11 @@ configureDNS() {
   arguments=$(echo "$arguments" | sed 's/\t/ /g' | tr -s ' ' | sed 's/^ *//')
   [[ "$DEBUG" == [Yy1]* ]] && printf "Dnsmasq arguments:\n\n%s\n\n" "${arguments// -/$'\n-'}"
 
-  if ! $DNSMASQ ${arguments:+ $arguments}; then
+  { $DNSMASQ ${arguments:+ $arguments}; rc=$?; } || :
 
-    local msg="Failed to start Dnsmasq, reason: $?"
+  if (( rc != 0 )); then
+
+    local msg="Failed to start Dnsmasq, reason: $rc"
 
     if [[ "${NETWORK,,}" == "slirp" || "${NETWORK,,}" == "passt" || "$ROOTLESS" != [Yy1]* || "$DEBUG" == [Yy1]* ]]; then
       [ -f "$log" ] && [ -s "$log" ] && cat "$log"
@@ -246,9 +248,7 @@ getUserPorts() {
   done
 
   # Remove duplicates
-  ports=$(echo "${ports//,,/,}," | awk 'BEGIN{RS=ORS=","} !seen[$0]++' | sed 's/,*$//g')
-
-  echo "$ports"
+  echo "${ports//,,/,}," | awk 'BEGIN{RS=ORS=","} !seen[$0]++' | sed 's/,*$//g'
   return 0
 }