Update update's.json and changelog

.github/workflows/workflow.yml

@@ -96,9 +96,6 @@ jobs:
           updateJson=https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/update-hosts.json
           EOF
 
-      - name: Tree files
-        run: |
-          tree zaprett/ zaprett-hosts/ zaprett-tv/
       - name: Create archives
         run: |
           cd zaprett && zip -r ../zaprett.zip ./* && cd ..
@@ -125,8 +122,6 @@ jobs:
           name: zaprett
           path: out/*
 
-      
-
       - name: Update changelog
         if: ${{ inputs.create_release == 'true' }}
         run: echo "${{ inputs.release_changes }}" > changelog.md
@@ -150,20 +145,12 @@ jobs:
             "changelog": "https://raw.githubusercontent.com/${{ github.repository }}/refs/heads/main/changelog.md"
           }
           EOF
-          cat > update-tv.json <<EOF
-          {
-            "version": "${{ inputs.version }}",
-            "versionCode": ${{ inputs.version_code }},
-            "zipUrl": "https://github.com/${{ github.repository }}/releases/download/${{ inputs.tag }}/zaprett-tv.zip",
-            "changelog": "https://raw.githubusercontent.com/${{ github.repository }}/refs/heads/main/changelog.md"
-          }
-          EOF
       - name: Commit jsons and changelog
         if: ${{ inputs.create_release == 'true' }}
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: "Update update's.json and changelog"
-          file_pattern: "update.json update_hosts.json changelog.md"
+          file_pattern: "update.json update-hosts.json changelog.md"
       - name: Send bot post
         env:
           MESSAGE_TEXT: |

.github/workflows/workflow_without_post.yml

@@ -97,9 +97,6 @@ jobs:
           updateJson=https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/update-hosts.json
           EOF
 
-      - name: Tree files
-        run: |
-          tree zaprett/ zaprett-hosts/ zaprett-tv/
       - name: Create archives
         run: |
           cd zaprett && zip -r ../zaprett.zip ./* && cd ..
@@ -126,8 +123,6 @@ jobs:
           name: zaprett
           path: out/*
 
-      
-
       - name: Update changelog
         if: ${{ inputs.create_release == 'true' }}
         run: echo "${{ inputs.release_changes }}" > changelog.md

changelog.md

@@ -1,3 +1 @@
-Обновление бинарников zapret до версии 72.2
-Обновление hosts файла в zaprett hosts
-
+Список изменений: 1. Полностью переписали модуль с Bash на Rust 2. Теперь конфиг хранится в формате JSON

rust/Cargo.toml

@@ -24,3 +24,9 @@ pretty_env_logger = "0.5.0"
 nix = { version = "0.30.1", features = ["signal"] }
 getset = "0.1.6"
 sysinfo = "0.37.2"
+
+[profile.release]
+panic = "abort"
+opt-level = "z"
+lto = true
+strip = true

src/customize.sh

@@ -21,7 +21,7 @@ ui_print "Filling configuration file if not exist..."
 if [ ! -f "/sdcard/zaprett/config.json" ]; then
     cat > /sdcard/zaprett/config.json << EOL
     {
-      "active_lists": ["/sdcard/zaprett/lists/include/list-youtube.txt", "/sdcard/zaprett/lists/include/list-youtube.txt"],
+      "active_lists": ["/sdcard/zaprett/lists/include/list-youtube.txt", "/sdcard/zaprett/lists/include/list-discord.txt"],
       "active_ipsets": [],
       "active_exclude_lists": [],
       "active_exclude_ipsets": [],
@@ -31,7 +31,7 @@ if [ ! -f "/sdcard/zaprett/config.json" ]; then
       "whitelist": [],
       "blacklist": []
     }
-    EOL
+EOL
 fi
 
 ui_print "Copying lists and binaries to /sdcard/zaprett..."

update-hosts.json

@@ -1,6 +1,6 @@
 {
-  "version": "5.2",
-  "versionCode": 52,
-  "zipUrl": "https://github.com/egor-white/zaprett/releases/download/5.2.0/zaprett-hosts.zip",
+  "version": "6.0",
+  "versionCode": 60,
+  "zipUrl": "https://github.com/egor-white/zaprett/releases/download/6.0.0/zaprett-hosts.zip",
   "changelog": "https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/changelog.md"
 }

update.json

@@ -1,6 +1,6 @@
 {
-  "version": "5.2",
-  "versionCode": 52,
-  "zipUrl": "https://github.com/egor-white/zaprett/releases/download/5.2.0/zaprett.zip",
+  "version": "6.0",
+  "versionCode": 60,
+  "zipUrl": "https://github.com/egor-white/zaprett/releases/download/6.0.0/zaprett.zip",
   "changelog": "https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/changelog.md"
 }