From d22097ee33f0de505568b82d455c6b20c08630cf Mon Sep 17 00:00:00 2001 From: huzibaca Date: Mon, 28 Oct 2024 13:09:55 +0800 Subject: [PATCH] chore: optimised the logic of dns processing --- scripts/set_dns.sh | 11 +++++------ scripts/unset_dns.sh | 6 ++---- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/scripts/set_dns.sh b/scripts/set_dns.sh index 011adf75..18a98fee 100644 --- a/scripts/set_dns.sh +++ b/scripts/set_dns.sh @@ -49,10 +49,9 @@ hardware_port=$(networksetup -listallhardwareports | awk -v dev="$nic" ' original_dns=$(networksetup -getdnsservers "$hardware_port") -if [ ${#original_dns} -gt 15 ]; then - echo "Empty" >original_dns.txt -else - echo $original_dns >original_dns.txt +if [ ${#original_dns} -le 15 ]; then + if [ -n "$original_dns" ]; then + echo $original_dns >original_dns.txt + networksetup -setdnsservers "$hardware_port" "$1" + fi fi - -networksetup -setdnsservers "$hardware_port" "$1" diff --git a/scripts/unset_dns.sh b/scripts/unset_dns.sh index 9d98aff1..76d7f7e8 100644 --- a/scripts/unset_dns.sh +++ b/scripts/unset_dns.sh @@ -15,8 +15,6 @@ hardware_port=$(networksetup -listallhardwareports | awk -v dev="$nic" ' if [ -f original_dns.txt ]; then original_dns=$(cat original_dns.txt) -else - original_dns=$(networksetup -getdnsservers "$hardware_port") + networksetup -setdnsservers "$hardware_port" $original_dns + rm -rf original_dns.txt fi - -networksetup -setdnsservers "$hardware_port" $original_dns