From 18f78d7672b6e1d8fc484ec8fe412e694be21017 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Sat, 25 Apr 2026 18:21:52 -0500 Subject: [PATCH] Improve OS check --- extras/vpnupgrade_ubuntu.sh | 6 ++++-- vpnsetup_ubuntu.sh | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/extras/vpnupgrade_ubuntu.sh b/extras/vpnupgrade_ubuntu.sh index 459b2b8..661148a 100755 --- a/extras/vpnupgrade_ubuntu.sh +++ b/extras/vpnupgrade_ubuntu.sh @@ -169,7 +169,8 @@ update_apt_cache() { install_pkgs() { p1=libcurl4-nss-dev - if [ "$os_ver" = "trixiesid" ] || [ "$os_ver" = 13 ]; then + if [ "$os_ver" = "trixiesid" ] || [ "$os_ver" = 13 ] \ + || [ "$os_ver" = "forkysid" ] || [ "$os_ver" = 14 ]; then p1=libcurl4-gnutls-dev fi ( @@ -181,7 +182,8 @@ install_pkgs() { ) || exiterr2 if { [ "$os_type" = "ubuntu" ] && [ -n "$ubuntu_ver" ] \ && printf '%s\n%s' "24.10" "$ubuntu_ver" | sort -C -V; } \ - || [ "$os_ver" = 13 ]; then + || [ "$os_ver" = "trixiesid" ] || [ "$os_ver" = 13 ] \ + || [ "$os_ver" = "forkysid" ] || [ "$os_ver" = 14 ]; then ( set -x apt-get -yqq install systemd-dev >/dev/null diff --git a/vpnsetup_ubuntu.sh b/vpnsetup_ubuntu.sh index d832c38..b695ddd 100755 --- a/vpnsetup_ubuntu.sh +++ b/vpnsetup_ubuntu.sh @@ -274,7 +274,8 @@ detect_ipv6() { install_vpn_pkgs() { bigecho "Installing packages required for the VPN..." p1=libcurl4-nss-dev - if [ "$os_ver" = "trixiesid" ] || [ "$os_ver" = 13 ]; then + if [ "$os_ver" = "trixiesid" ] || [ "$os_ver" = 13 ] \ + || [ "$os_ver" = "forkysid" ] || [ "$os_ver" = 14 ]; then p1=libcurl4-gnutls-dev fi ( @@ -286,7 +287,8 @@ install_vpn_pkgs() { ) || exiterr2 if { [ "$os_type" = "ubuntu" ] && [ -n "$ubuntu_ver" ] \ && printf '%s\n%s' "24.10" "$ubuntu_ver" | sort -C -V; } \ - || [ "$os_ver" = 13 ]; then + || [ "$os_ver" = "trixiesid" ] || [ "$os_ver" = 13 ] \ + || [ "$os_ver" = "forkysid" ] || [ "$os_ver" = 14 ]; then ( set -x apt-get -yqq install systemd-dev >/dev/null