mirror of
https://github.com/hwdsl2/setup-ipsec-vpn.git
synced 2024-07-04 11:35:41 +02:00
Update IKEv2 script
- Cleanup
This commit is contained in:
parent
c04d056be6
commit
c2d7eef27c
|
@ -1134,27 +1134,18 @@ EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
check_swan_ver() {
|
check_swan_ver() {
|
||||||
base_url="https://github.com/hwdsl2/vpn-extras/raw/main/ver/upg"
|
base_url="https://github.com/hwdsl2/vpn-extras/releases/download/v1.0.0"
|
||||||
if [ "$in_container" = "0" ]; then
|
swan_ver_url="$base_url/upg-$os_type-$os_ver-swanver"
|
||||||
swan_ver_url="$base_url/$os_type/$os_ver/swanver"
|
|
||||||
else
|
|
||||||
swan_ver_url="$base_url/docker/$os_type/$os_arch/swanver"
|
|
||||||
fi
|
|
||||||
swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" | head -n 1)
|
swan_ver_latest=$(wget -t 3 -T 15 -qO- "$swan_ver_url" | head -n 1)
|
||||||
}
|
|
||||||
|
|
||||||
show_update_info() {
|
|
||||||
if printf '%s' "$swan_ver_latest" | grep -Eq '^([3-9]|[1-9][0-9]{1,2})(\.([0-9]|[1-9][0-9]{1,2})){1,2}$' \
|
if printf '%s' "$swan_ver_latest" | grep -Eq '^([3-9]|[1-9][0-9]{1,2})(\.([0-9]|[1-9][0-9]{1,2})){1,2}$' \
|
||||||
&& [ -n "$swan_ver" ] && [ "$swan_ver" != "$swan_ver_latest" ] \
|
&& [ -n "$swan_ver" ] && [ "$swan_ver" != "$swan_ver_latest" ] \
|
||||||
&& printf '%s\n%s' "$swan_ver" "$swan_ver_latest" | sort -C -V; then
|
&& printf '%s\n%s' "$swan_ver" "$swan_ver_latest" | sort -C -V; then
|
||||||
echo "Note: A newer version of Libreswan ($swan_ver_latest) is available."
|
cat <<EOF
|
||||||
if [ "$in_container" = "0" ]; then
|
Note: A newer version of Libreswan ($swan_ver_latest) is available.
|
||||||
echo " To update, run:"
|
To update, run:
|
||||||
echo " wget https://git.io/vpnupgrade -O vpnup.sh && sudo sh vpnup.sh"
|
wget https://git.io/vpnupgrade -O vpnup.sh && sudo sh vpnup.sh
|
||||||
else
|
|
||||||
echo " To update this Docker image, see: https://git.io/updatedockervpn"
|
EOF
|
||||||
fi
|
|
||||||
echo
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1449,8 +1440,9 @@ ikev2setup() {
|
||||||
fi
|
fi
|
||||||
print_setup_complete
|
print_setup_complete
|
||||||
print_client_info
|
print_client_info
|
||||||
|
if [ "$in_container" = "0" ]; then
|
||||||
check_swan_ver
|
check_swan_ver
|
||||||
show_update_info
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
## Defer setup until we have the complete script
|
## Defer setup until we have the complete script
|
||||||
|
|
Loading…
Reference in New Issue
Block a user