Merge branch 'RROrg:main' into main

offsoc · Jan 27, 2025 · 26229a4 · 26229a4
2 parents 3488715 + 545bc2a
commit 26229a4
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 27 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-25.1.3
+25.1.4
diff --git a/docs/addons.json b/docs/addons.json
@@ -559,26 +559,6 @@
             "zh_TW": "還原插件修改."
         }
     },
-    "rndis": {
-        "system": true,
-        "description": {
-            "en_US": "Android USB Network Adapter.",
-            "ar_SA": "محول شبكة USB لنظام Android.",
-            "de_DE": "Android USB-Netzwerkadapter.",
-            "es_ES": "Adaptador de red USB de Android.",
-            "fr_FR": "Adaptateur réseau USB Android.",
-            "ja_JP": "Android USB ネットワークアダプター",
-            "ko_KR": "안드로이드 USB 네트워크 어댑터.",
-            "ru_RU": "Адаптер сети USB для Android.",
-            "th_TH": "อะแดปเตอร์เครือข่าย USB สำหรับ Android",
-            "tr_TR": "Android USB Ağ Adaptörü.",
-            "uk_UA": "Адаптер мережі USB для Android.",
-            "vi_VN": "Bộ chuyển đổi mạng USB Android.",
-            "zh_CN": "Android USB 网络适配器.",
-            "zh_HK": "Android USB 網路適配器",
-            "zh_TW": "Android USB 網路介面卡."
-        }
-    },
     "sensors": {
         "system": false,
         "description": {

diff --git a/docs/addons.xlsx b/docs/addons.xlsx
diff --git a/docs/models.xlsx b/docs/models.xlsx
diff --git a/docs/modules.xlsx b/docs/modules.xlsx
diff --git a/docs/pats.xlsx b/docs/pats.xlsx
diff --git a/files/initrd/opt/rr/include/consts.sh b/files/initrd/opt/rr/include/consts.sh
@@ -1,4 +1,4 @@
-RR_VERSION="25.1.3"
+RR_VERSION="25.1.4"
 RR_RELEASE=""
 RR_TITLE="RR v${RR_VERSION}"
 

diff --git a/files/initrd/opt/rr/include/functions.py b/files/initrd/opt/rr/include/functions.py
@@ -133,7 +133,6 @@ def getmodels(platforms=None):
         req = session.get(url, timeout=10, verify=False)
         req.encoding = "utf-8"
         p = re.compile(r"<mUnique>(.*?)</mUnique>.*?<mLink>(.*?)</mLink>", re.MULTILINE | re.DOTALL)
-
         data = p.findall(req.text)
         for item in data:
             if not "DSM" in item[1]:

diff --git a/files/initrd/opt/rr/include/functions.sh b/files/initrd/opt/rr/include/functions.sh
@@ -429,7 +429,7 @@ function connectwlanif() {
       kill -9 "$(cat /var/run/wpa_supplicant.pid.${1})"
       rm -f "/var/run/wpa_supplicant.pid.${1}"
     fi
-    wpa_supplicant -i "${1}" -c "${CONF}" -B -P "/var/run/wpa_supplicant.pid.${1}" >/dev/null 2>&1
+    wpa_supplicant -i "${1}" -c "${CONF}" -qq -B -P "/var/run/wpa_supplicant.pid.${1}" >/dev/null 2>&1
   fi
   return 0
 }

diff --git a/files/initrd/opt/rr/ramdisk-patch.sh b/files/initrd/opt/rr/ramdisk-patch.sh
@@ -173,7 +173,7 @@ mkdir -p "${RAMDISK_PATH}/addons"
 chmod +x "${RAMDISK_PATH}/addons/addons.sh"
 
 # This order cannot be changed.
-for ADDON in "redpill" "revert" "misc" "eudev" "disks" "localrss" "notify" "wol" "rndis"; do
+for ADDON in "redpill" "revert" "misc" "eudev" "disks" "localrss" "notify" "wol"; do
   PARAMS=""
   if [ "${ADDON}" = "disks" ]; then
     PARAMS=${HDDSORT}

diff --git a/files/mnt/p1/RR_VERSION b/files/mnt/p1/RR_VERSION
@@ -1 +1 @@
-25.1.3
+25.1.4
diff --git a/scripts/func.py b/scripts/func.py
@@ -50,7 +50,6 @@ def getmodels(workpath, jsonpath, xlsxpath):
         req = session.get(url, timeout=10, verify=False)
         req.encoding = "utf-8"
         p = re.compile(r"<mUnique>(.*?)</mUnique>.*?<mLink>(.*?)</mLink>", re.MULTILINE | re.DOTALL)
-
         data = p.findall(req.text)
     except Exception as e:
         click.echo(f"Error: {e}")