From feb43aa21783abfca5c6d0a6e8c07151827e01ed Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 13 Feb 2024 15:00:26 +0100
Subject: [PATCH] Fix openmptcprouter-vps fix, and no need to get config for
 proxy/vpn not installed

---
 .../files/etc/init.d/openmptcprouter-vps       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index 544a4ff74..ef12d21fd 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -2261,15 +2261,15 @@ _config_service() {
 	if [ "$user_permission" != "ro" ]; then
 		#config_load shadowsocks-libev
 		#config_foreach _set_ss_server_vps server
-		_set_ss_server_vps
-		_set_ssgo_server_vps
-		_set_v2ray_server_vps
-		_set_xray_server_vps
-		[ -z "$(_set_glorytun_vps)" ] && error=1
-		[ -z "$(_set_openvpn_vps)" ] && error=1
-		[ -z "$(_set_mlvpn_vps)" ] && error=1
+		[ -n "$(uci -q get shadowsocks-libev)" ] && _set_ss_server_vps
+		[ -n "$(uci -q get shadowsocks-rust)" ] && _set_ssgo_server_vps
+		[ -n "$(uci -q get v2ray)" ] && _set_v2ray_server_vps
+		[ -n "$(uci -q get xray)" ] && _set_xray_server_vps
+		([ -n "$(uci -q get glorytun)" ] || [ -n "$(uci -q get glorytun-udp)" ]) && [ -z "$(_set_glorytun_vps)" ] && error=1
+		[ -n "$(uci -q get openvpn)" ] && [ -z "$(_set_openvpn_vps)" ] && error=1
+		[ -n "$(uci -q get mlvpn)" ] && [ -z "$(_set_mlvpn_vps)" ] && error=1
 		_set_vps_firewall
-		[ -z "$(_set_wireguard_vps)" ] && error=1
+		[ -n "$(uci -q get wireguard)" ] && [ -z "$(_set_wireguard_vps)" ] && error=1
 	fi
 	_backup_list
 	redirect_port="0"
@@ -2341,7 +2341,7 @@ token() {
 }
 
 _fix_server() {
-	uci -q rename openmptcprouter.$1=server
+	uci -q set openmptcprouter.$1=server
 }
 
 start_service() {