Skip to content

fix get_current_service function #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix get_current_service function #9

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
095e92f
fix get_current_service function
arainho Jan 5, 2023
0565056
Quotes and braces to prevent issues
arainho Jan 5, 2023
2bcd7d1
fix SC2116
arainho Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions dnscrypt-proxy-switcher.10s.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,22 @@ ospatch=$(echo "$osversion" | awk -F. '{print $3}')

get_current_service() {
services=$(networksetup -listnetworkserviceorder | grep -F 'Hardware Port')
echo "$services" | while read -r line; do
while read -r line; do
sname=$(echo "$line" | awk -F "(, )|(: )|[)]" '{print $2}')
sdev=$(echo "$line" | awk -F "(, )|(: )|[)]" '{print $4}')
if [ -n "$sdev" ]; then
ifout="$(ifconfig "$sdev" 2>/dev/null)"
if echo "$ifout" | grep -Fq 'status: active'; then
currentservice="$sname"
break
if [ "$sname" == 'USB 10/100/1000 LAN' ]; then
currentservice="${sname} ($sdev)"
break
else
currentservice="$sname"
break
fi
fi
fi
done
done <<<"${services}"

if [ -n "$currentservice" ]; then
echo "$currentservice"
Expand Down