From 3b4f875051892fd68a280b84cce91f2adda2d306 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 23 Oct 2024 06:11:05 +0000
Subject: [PATCH] Update OMR admin, omr-service and shadowsocks-go

---
 debian9-x86_64.sh | 6 +++---
 omr-service       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian9-x86_64.sh b/debian9-x86_64.sh
index 539f49c..2ca9e36 100755
--- a/debian9-x86_64.sh
+++ b/debian9-x86_64.sh
@@ -78,8 +78,8 @@ MLVPN_BINARY_VERSION="3.0.0+20211028.git.ddafba3"
 UBOND_VERSION="31af0f69ebb6d07ed9348dca2fced33b956cedee"
 OBFS_VERSION="486bebd9208539058e57e23a12f23103016e09b4"
 OBFS_BINARY_VERSION="0.0.5-1"
-OMR_ADMIN_VERSION="b31e764e7b6159b748b3b176bc26395e051a1f38"
-OMR_ADMIN_BINARY_VERSION="0.12+20240920"
+OMR_ADMIN_VERSION="371ce38ec213fb6d18b79a91e5aa354ea36b649f"
+OMR_ADMIN_BINARY_VERSION="0.13+20241016"
 #OMR_ADMIN_BINARY_VERSION="0.3+20220827"
 DSVPN_VERSION="3b99d2ef6c02b2ef68b5784bec8adfdd55b29b1a"
 DSVPN_BINARY_VERSION="0.1.4-2"
@@ -93,7 +93,7 @@ EASYRSA_VERSION="3.0.6"
 #fi
 IPROUTE2_VERSION="29da83f89f6e1fe528c59131a01f5d43bcd0a000"
 SHADOWSOCKS_BINARY_VERSION="3.3.5-3"
-SHADOWSOCKS_GO_VERSION="1.8.0"
+SHADOWSOCKS_GO_VERSION="1.11.3"
 DEFAULT_USER="openmptcprouter"
 VPS_DOMAIN=${VPS_DOMAIN:-$(wget -4 -qO- -T 2 http://hostname.openmptcprouter.com)}
 VPSPATH="server-test"
diff --git a/omr-service b/omr-service
index 80250ba..12800ed 100755
--- a/omr-service
+++ b/omr-service
@@ -124,7 +124,7 @@ _omr_api() {
 }
 
 _lan_route() {
-	cat /etc/openmptcprouter-vps-admin/omr-admin-config.json | jq -c '.users[0][]?' |
+	jq -c '.users[0][]?' /etc/openmptcprouter-vps-admin/omr-admin-config.json |
 	while IFS=$"\n" read -r c; do
 		if [ -n "$c" ]; then
 			vpnremoteip=$(echo "$c" | jq -r '.vpnremoteip')