Skip to content

Commit a002471

Browse files
committed
Fix handling of "USB to LAN" interfaces
Fixex #9
1 parent c8bf0db commit a002471

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

dnscrypt-proxy-switcher.10s.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,22 @@ ospatch=$(echo "$osversion" | awk -F. '{print $3}')
5454

5555
get_current_service() {
5656
services=$(networksetup -listnetworkserviceorder | grep -F 'Hardware Port')
57-
echo "$services" | while read -r line; do
57+
while read -r line; do
5858
sname=$(echo "$line" | awk -F "(, )|(: )|[)]" '{print $2}')
5959
sdev=$(echo "$line" | awk -F "(, )|(: )|[)]" '{print $4}')
6060
if [ -n "$sdev" ]; then
6161
ifout="$(ifconfig "$sdev" 2>/dev/null)"
6262
if echo "$ifout" | grep -Fq 'status: active'; then
63-
currentservice="$sname"
64-
break
63+
if [ "$sname" == 'USB 10/100/1000 LAN' ]; then
64+
currentservice="${sname} ($sdev)"
65+
break
66+
else
67+
currentservice="$sname"
68+
break
69+
fi
6570
fi
6671
fi
67-
done
72+
done <<<"${services}"
6873

6974
if [ -n "$currentservice" ]; then
7075
echo "$currentservice"
@@ -114,7 +119,7 @@ get_current_resolvers() {
114119
}
115120

116121
flush_dns_cache() {
117-
if ["$osmajor" -ge 11 ]; then
122+
if [ "$osmajor" -ge 11 ]; then
118123
dscacheutil -flushcache 2>/dev/null
119124
else
120125
if [ "$osminor" -le 8 ]; then

0 commit comments

Comments
 (0)