update build scripts

build-module.sh

@@ -9,14 +9,12 @@ just -f rust/justfile build-android --release
 echo "Make build dirs"
 mkdir -p zaprett/system/bin
 mkdir -p zaprett/zaprett/bin
-mkdir -p zaprett/zaprett/lists/include
+mkdir -p zaprett/zaprett/files/lists/include
-mkdir -p zaprett/zaprett/manifests/lists/include
 mkdir -p zaprett-hosts/system/bin
 mkdir -p zaprett-hosts/system/etc
 mkdir -p zaprett-hosts/zaprett/bin
-mkdir -p zaprett-hosts/zaprett/lists/include
+mkdir -p zaprett-hosts/zaprett/files/lists/include
-mkdir -p zaprett-hosts/zaprett/manifests/lists/include
+mkdir -p out lists
-mkdir -p out manifests lists
 
 echo "Copy files to dirs"
 cp rust/target/armv7-linux-androideabi/release/zaprett zaprett/system/bin/zaprett-armv7
@@ -49,15 +47,11 @@ done
 cp -a src/* zaprett/
 cp -r zaprett/* zaprett-hosts/
 
-echo "Download and copy actual lists and manifests"
+echo "Download and copy actual lists"
-wget https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/manifests/lists/include/list-youtube.json -O manifests/list-youtube.json
-wget https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/manifests/lists/include/list-discord.json -O manifests/list-discord.json
 wget https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/files/lists/include/list-youtube.txt -O lists/list-youtube.txt
 wget https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/files/lists/include/list-discord.txt -O lists/list-discord.txt
-cp lists/* zaprett/zaprett/lists/include/
+cp lists/* zaprett/zaprett/files/lists/include/
-cp manifests/* zaprett/zaprett/manifests/lists/include
+cp lists/* zaprett-hosts/zaprett/files/lists/include/
-cp lists/* zaprett-hosts/zaprett/lists/include/
-cp manifests/* zaprett-hosts/zaprett/manifests/lists/include
 cp hosts/hosts zaprett-hosts/system/etc
 
 echo "Create module.prop"
@@ -88,4 +82,4 @@ mv zaprett.zip out/
 mv zaprett-hosts.zip out/
 
 echo "Clean temp files"
-rm -rf zaprett zaprett-hosts manifests lists
+rm -rf zaprett zaprett-hosts lists

src/customize.sh

@@ -12,7 +12,7 @@ ui_print "App by: egor-white, Cherret"
 ui_print "####################"
 
 ui_print "Creating zaprett directory..."
-mkdir /sdcard/zaprett; mkdir /sdcard/zaprett/lists; mkdir /sdcard/zaprett/bin; mkdir /sdcard/zaprett/strategies;
+mkdir /sdcard/zaprett
 
 ui_print "Copying lists and binaries to /sdcard/zaprett..."
 cp -r $MODPATH/zaprett/. /sdcard/zaprett/

src/zaprett/manifests/bin/quic_initial_www_google_com.json

@@ -0,0 +1,10 @@
+{
+    "schema": 1,
+    "id": "quic_initial_www_google_com",
+    "name": "quic_initial_www_google_com",
+    "version": "1.0.0",
+    "author": "zaprett-devs",
+    "description": "Binary artifact: quic_initial_www_google_com",
+    "dependencies": [],
+    "file": "/storage/emulated/0/zaprett/files/bin/quic_initial_www_google_com.bin"
+}

src/zaprett/manifests/bin/tls_clienthello_4pda_to.json

@@ -0,0 +1,10 @@
+{
+    "schema": 1,
+    "id": "tls_clienthello_4pda_to",
+    "name": "tls_clienthello_4pda_to",
+    "version": "1.0.0",
+    "author": "zaprett-devs",
+    "description": "Binary artifact: tls_clienthello_4pda_to",
+    "dependencies": [],
+    "file": "/storage/emulated/0/zaprett/files/bin/tls_clienthello_4pda_to.bin"
+}

src/zaprett/manifests/bin/tls_clienthello_www_google_com.json

@@ -0,0 +1,10 @@
+{
+    "schema": 1,
+    "id": "tls_clienthello_www_google_com",
+    "name": "tls_clienthello_www_google_com",
+    "version": "1.0.0",
+    "author": "zaprett-devs",
+    "description": "Binary artifact: tls_clienthello_www_google_com",
+    "dependencies": [],
+    "file": "/storage/emulated/0/zaprett/files/bin/tls_clienthello_www_google_com.bin"
+}

src/zaprett/manifests/lists/include/list-discord.json

@@ -0,0 +1,10 @@
+{
+    "schema": 1,
+    "id": "list-discord",
+    "name": "list-discord",
+    "version": "1.0.0",
+    "author": "zaprett-devs",
+    "description": "Домены Discord",
+    "dependencies": [],
+    "file": "/storage/emulated/0/zaprett/files/lists/include/list-discord.txt"
+}

src/zaprett/manifests/lists/include/list-youtube.json

@@ -0,0 +1,10 @@
+{
+    "schema": 1,
+    "id": "list-youtube",
+    "name": "list-youtube",
+    "version": "1.0.0",
+    "author": "zaprett-devs",
+    "description": "Домены YouTube",
+    "dependencies": [],
+    "file": "/storage/emulated/0/zaprett/files/lists/include/list-youtube.txt"
+}