Merge pull request #434 from itdoginfo/version

Use is_min_package_version to check sing-box >= 1.12.4

podkop/files/usr/bin/podkop

@@ -510,7 +510,7 @@ list_update() {
         local service_proxy_address
         service_proxy_address="$(get_service_proxy_address)"
 
-        if [ -n "$http_proxy_address" ]; then
+        if [ -n "$service_proxy_address" ]; then
             if curl -s -x "http://$service_proxy_address" -m $curl_timeout https://github.com > /dev/null; then
                 echolog "✅ GitHub connection check passed (via proxy)"
                 break
@@ -2152,21 +2152,9 @@ check_sing_box() {
         # Check version (must be >= 1.12.4)
         local version
         version=$(sing-box version 2> /dev/null | head -n 1 | awk '{print $3}')
-        if [ -n "$version" ]; then
-            version=$(echo "$version" | sed 's/^v//')
-            local major
-            local minor
-            local patch
-            major=$(echo "$version" | cut -d. -f1)
-            minor=$(echo "$version" | cut -d. -f2)
-            patch=$(echo "$version" | cut -d. -f3)
-
-            # Compare version: must be >= 1.12.4
-            if [ "$major" -gt 1 ] ||
-                [ "$major" -eq 1 ] && [ "$minor" -gt 12 ] ||
-                [ "$major" -eq 1 ] && [ "$minor" -eq 12 ] && [ "$patch" -ge 4 ]; then
-                sing_box_version_ok=1
-            fi
+        version="${version#v}"
+        if [ -n "$version" ] && is_min_package_version "$version" "1.12.4"; then
+            sing_box_version_ok=1
         fi
     fi
 

podkop/files/usr/lib/rulesets.sh

@@ -60,7 +60,7 @@ patch_source_ruleset_rules() {
 import_plain_domain_list_to_local_source_ruleset_chunked() {
     local plain_list_filepath="$1"
     local ruleset_filepath="$2"
-    local chunk_size="${3:-5000}"
+    local chunk_size="${3:-1000}"
 
     local array count json_array
     count=0
@@ -102,7 +102,7 @@ import_plain_domain_list_to_local_source_ruleset_chunked() {
 import_plain_subnet_list_to_local_source_ruleset_chunked() {
     local plain_list_filepath="$1"
     local ruleset_filepath="$2"
-    local chunk_size="${3:-5000}"
+    local chunk_size="${3:-1000}"
 
     local array count json_array
     count=0