Skip to content

fix: current active menu item #7

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 1 commit into
base: master
Choose a base branch
from
Open

fix: current active menu item #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions DNSCryptMenu.30s.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1518,14 +1518,16 @@ _current_resolvers () {

_displayname () {
resolvers="$1"
allips=$(echo "$DNSCRYPT_PROXY_IPS $ADDITIONAL_IPS" | xargs -n1 | sort -g | xargs)
defips=$(echo "$UDEFAULTS" | xargs -n1 | sort -g | xargs)
if [[ $resolvers == $DNSCRYPT_PROXY_IPS ]] ; then
echo "DNSCrypt"
elif [[ $resolvers == "$DNSCRYPT_PROXY_IPS $ADDITIONAL_IPS" ]] ; then
elif [[ $resolvers == $allips ]] ; then
echo "DNSCrypt + Fallback"
elif [[ $resolvers == $UDEFAULTS ]] ; then
elif [[ $resolvers == *"$defips"* ]] ; then
if [[ $UDEFAULTS == $DNSCRYPT_PROXY_IPS ]] ; then
echo "DNSCrypt"
elif [[ $UDEFAULTS == "$DNSCRYPT_PROXY_IPS $ADDITIONAL_IPS" ]] ; then
elif [[ $defips == $allips ]] ; then
echo "DNSCrypt + Fallback"
else
echo "Default DNS"
Expand All @@ -1535,7 +1537,7 @@ _displayname () {
fi
}

current_resolvers=$(_current_resolvers)
current_resolvers=$(_service_resolvers "$service" | xargs -n1 | sort -g | xargs)
setting=$(_displayname "$current_resolvers")

if $proxy ; then
Expand Down