Skip to content
This repository has been archived by the owner on Feb 4, 2020. It is now read-only.

Avoid overwriting modified DNS upon restore #199

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

Avoid overwriting modified DNS upon restore #199

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c87fc0a
Avoid overwriting modified DNS upon restore
elias-pap Jul 27, 2019
15f5bc2
Fix custom DNS applied backup
elias-pap Jul 28, 2019
1afd7d4
Use tee to redirect input to both files
elias-pap Jul 28, 2019
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: 7 additions & 3 deletions protonvpn-cli.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ function modify_dns() {
networksetup -setdnsservers "$interface" $dns_server
done
else # non-Mac
echo -e "# ProtonVPN DNS - protonvpn-cli\nnameserver $dns_server" > "/etc/resolv.conf"
echo -e "# ProtonVPN DNS - protonvpn-cli\nnameserver $dns_server" | tee "/etc/resolv.conf" "$(get_protonvpn_cli_home)/.resolv.conf.protonvpn_applied_backup" 1> /dev/null
fi
fi

Expand All @@ -365,7 +365,7 @@ function modify_dns() {
networksetup -setdnsservers "$interface" $dns_server
done
else # non-Mac
echo -e "# ProtonVPN DNS - Custom DNS\nnameserver $dns_server" > "/etc/resolv.conf"
echo -e "# ProtonVPN DNS - Custom DNS\nnameserver $dns_server" | tee "/etc/resolv.conf" "$(get_protonvpn_cli_home)/.resolv.conf.protonvpn_applied_backup" 1> /dev/null
fi
fi

Expand All @@ -383,7 +383,11 @@ function modify_dns() {
fi
done
else # non-Mac
cp "$(get_protonvpn_cli_home)/.resolv.conf.protonvpn_backup" "/etc/resolv.conf"
if [[ $(diff "$(get_protonvpn_cli_home)/.resolv.conf.protonvpn_applied_backup" "/etc/resolv.conf") ]]; then
echo "[*] DNS was modified. Keeping the new version."
else
cp "$(get_protonvpn_cli_home)/.resolv.conf.protonvpn_backup" "/etc/resolv.conf"
fi
fi
fi
}
Expand Down