colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

sane-vpn: allow shorthands like "sane-vpn up us" instead of full ovpnd-us

Browse Source
This commit is contained in:
Colin 2024-02-20 23:01:53 +00:00
parent bb569b1668
commit ee7d99289a
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/additional/sane-scripts/src/sane-vpn
View File

@ -37,8 +37,8 @@ debug() {
# load VPN names from disk # load VPN names from disk
getVpns() { getVpns() {
vpns=$(ls ~/.config/sane-vpn/vpns) vpns=($(ls ~/.config/sane-vpn/vpns))
defaultVpn=$(cat ~/.config/sane-vpn/default) defaultVpn="$(cat ~/.config/sane-vpn/default)"
debug "default vpn: $defaultVpn" debug "default vpn: $defaultVpn"
} }
@ -57,10 +57,19 @@ sourceVpn() {
} }
canonicalizeRegion() { canonicalizeRegion() {
if [ -n "$region" ] || [ "$region" = "default" ]; then debug "region before canonicalization: '$region'"
debug "canonicalizing region to $defaultVpn" for v in "${vpns[@]}"; do
if [ "ovpnd-$region" = "$v" ]; then
debug "canonicalizing shorthand ovpnd- region to '$v'"
region="$v"
fi
done
if [ -z "$region" ] || [ "$region" = "default" ]; then
debug "canonicalizing default region to '$defaultVpn'"
region="$defaultVpn" region="$defaultVpn"
fi fi
debug "region after canonicalization: '$region'"
} }
vpnToggle() { vpnToggle() {