Update workflow_without_post.yml

.github/workflows/workflow.yml

@@ -42,7 +42,7 @@ jobs:
 
       - name: Setup Git submodules
         run: git submodule update --init --recursive
-        
+
       - name: Install dependencies
         run: sudo apt install build-essential pkg-config just unzip
 
@@ -50,7 +50,16 @@ jobs:
         run: just -f rust/justfile build-android --release
 
       - name: Make build dirs
-        run: mkdir -p zaprett/system/bin zaprett-hosts/system/bin zaprett/system/etc/zaprett/lists out lists zapret-hosts/system/etc/zaprett/lists
+        run: |
+          mkdir -p zaprett/system/bin
+          mkdir -p zaprett/zaprett/bin
+          mkdir -p zaprett/zaprett/lists/include
+
+          mkdir -p zaprett-hosts/system/bin
+          mkdir -p zaprett-hosts/zaprett/bin
+          mkdir -p zaprett-hosts/zaprett/lists/include
+
+          mkdir -p out lists
 
       - name: Copy files to dirs
         run: |
@@ -60,17 +69,15 @@ jobs:
 
           cp -a src/* zaprett/
           cp -r zaprett/* zaprett-hosts/
-    
+
       - name: Download and copy actual lists
         run: |
           wget https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/lists/include/list-youtube.txt -O lists/list-youtube.txt
           wget https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/lists/include/list-discord.txt -O lists/list-discord.txt
 
-          cp lists/list-youtube.txt zaprett/system/etc/zaprett/lists/
-          cp lists/list-youtube.txt zaprett-hosts/system/etc/zaprett/lists/
+          cp lists/* zaprett/zaprett/lists/include
 
-          cp lists/list-discord.txt zaprett/system/etc/zaprett/lists/
-          cp lists/list-discord.txt zaprett-hosts/system/etc/zaprett/lists/
+          cp lists/* zaprett-hosts/zaprett/lists/include
 
           cp hosts/hosts zaprett-hosts/system/etc
 
@@ -103,7 +110,7 @@ jobs:
 
           mv zaprett.zip out/
           mv zaprett-hosts.zip out/
-        
+
       - name: Create release
         if: ${{ inputs.create_release == 'true' }}
         uses: softprops/action-gh-release@v2

.github/workflows/workflow_without_post.yml

@@ -42,7 +42,7 @@ jobs:
 
       - name: Setup Git submodules
         run: git submodule update --init --recursive
-        
+
       - name: Install dependencies
         run: sudo apt install build-essential pkg-config just unzip
 
@@ -50,7 +50,16 @@ jobs:
         run: just -f rust/justfile build-android --release
 
       - name: Make build dirs
-        run: mkdir -p zaprett/system/bin zaprett-hosts/system/bin zaprett/system/etc/zaprett/lists out lists zapret-hosts/system/etc/zaprett/lists
+        run: |
+          mkdir -p zaprett/system/bin
+          mkdir -p zaprett/zaprett/bin
+          mkdir -p zaprett/zaprett/lists/include
+
+          mkdir -p zaprett-hosts/system/bin
+          mkdir -p zaprett-hosts/zaprett/bin
+          mkdir -p zaprett-hosts/zaprett/lists/include
+
+          mkdir -p out lists
 
       - name: Copy files to dirs
         run: |
@@ -61,20 +70,19 @@ jobs:
 
           cp -a src/* zaprett/
           cp -r zaprett/* zaprett-hosts/
-    
+
       - name: Download and copy actual lists
         run: |
           wget https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/lists/include/list-youtube.txt -O lists/list-youtube.txt
           wget https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/lists/include/list-discord.txt -O lists/list-discord.txt
 
-          cp lists/list-youtube.txt zaprett/system/etc/zaprett/lists/
-          cp lists/list-youtube.txt zaprett-hosts/system/etc/zaprett/lists/
+          cp lists/* zaprett/zaprett/lists/include/
 
-          cp lists/list-discord.txt zaprett/system/etc/zaprett/lists/
-          cp lists/list-discord.txt zaprett-hosts/system/etc/zaprett/lists/
+          cp lists/* zaprett-hosts/zaprett/lists/include/
 
           cp hosts/hosts zaprett-hosts/system/etc
 
+
       - name: Create module.prop
         run: |
           cat > zaprett/module.prop <<EOF
@@ -104,7 +112,7 @@ jobs:
 
           mv zaprett.zip out/
           mv zaprett-hosts.zip out/
-        
+
       - name: Create release
         if: ${{ inputs.create_release == 'true' }}
         uses: softprops/action-gh-release@v2
@@ -146,11 +154,10 @@ jobs:
             "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"
-

changelog.md

@@ -1,3 +1 @@
-Исправлен автозапуск
-Добавлена возможность прямого обращения к zapret
-Обновлен hosts-файл
+Список изменений:  1. Использование команды restart  2. Исправление customize.sh  3. Обновление hosts-файла

rust/crates/zaprett/src/cli.rs

@@ -5,7 +5,7 @@ use commands::Command;
 use getset::Getters;
 
 #[derive(Parser, Getters)]
-#[command(version)]
+// #[command(version)]
 #[getset(get = "pub")]
 pub struct CliApp {
     #[command(subcommand)]

rust/justfile

@@ -20,7 +20,7 @@ _download_android_ndk:
 
         curl -L -C - -o "$TMPFILE" "https://dl.google.com/android/repository/android-ndk-{{ANDROID_NDK_VERSION}}.zip"
 
-        unzip "$TMPFILE" -d "$TMPDIR"
+        unzip -q "$TMPFILE" -d "$TMPDIR"
 
         inner_folder=$(find "$TMPDIR" -mindepth 1 -maxdepth 1 -type d | head -n 1)
         mv -T "$inner_folder" "$NDK_HOME"

src/customize.sh

@@ -15,7 +15,7 @@ ui_print "Creating zaprett directory..."
 mkdir /sdcard/zaprett; mkdir /sdcard/zaprett/lists; mkdir /sdcard/zaprett/bin; mkdir /sdcard/zaprett/strategies;
 
 ui_print "Copying lists and binaries to /sdcard/zaprett..."
-cp -r $MODPATH/system/etc/zaprett/. /sdcard/zaprett/
+cp -r $MODPATH/zaprett/. /sdcard/zaprett/
 
 ui_print "Copying files to /bin"
 arch=$(uname -m)
@@ -38,7 +38,4 @@ mv $MODPATH/system/bin/$zaprett_bin $MODPATH/system/bin/zaprett
 rm $MODPATH/system/bin/zaprett-*
 mkdir $MODPATH/tmp
 
-ui_print "Cleaning temp files..."
-rm -rf $MODPATH/system/etc/zaprett
-
 ui_print "Installation done. Join us in Telegram: https://t.me/zaprett_module"

update-hosts.json

@@ -1,6 +1,6 @@
 {
-  "version": "6.2",
-  "versionCode": 62,
-  "zipUrl": "https://github.com/egor-white/zaprett/releases/download/6.2.0/zaprett-hosts.zip",
+  "version": "6.3",
+  "versionCode": 63,
+  "zipUrl": "https://github.com/egor-white/zaprett/releases/download/6.3.0/zaprett-hosts.zip",
   "changelog": "https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/changelog.md"
 }

update.json

@@ -1,6 +1,6 @@
 {
-  "version": "6.2",
-  "versionCode": 62,
-  "zipUrl": "https://github.com/egor-white/zaprett/releases/download/6.2.0/zaprett.zip",
+  "version": "6.3",
+  "versionCode": 63,
+  "zipUrl": "https://github.com/egor-white/zaprett/releases/download/6.3.0/zaprett.zip",
   "changelog": "https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/changelog.md"
 }