From 4451d789133016f04b1e799ce433e2f498172b3f Mon Sep 17 00:00:00 2001
From: egor-white <channela082@gmail.com>
Date: Sat, 14 Jun 2025 12:15:48 +0300
Subject: [PATCH] move files

---
 module.prop                      |  7 ------
 customize.sh => src/customize.sh | 38 +++++++++++++++++++++++++++++++-
 hosts => src/hosts               |  0
 service.sh => src/service.sh     |  0
 zaprett => src/zaprett           | 35 +++++------------------------
 5 files changed, 42 insertions(+), 38 deletions(-)
 delete mode 100644 module.prop
 rename customize.sh => src/customize.sh (63%)
 rename hosts => src/hosts (100%)
 rename service.sh => src/service.sh (100%)
 rename zaprett => src/zaprett (86%)

diff --git a/module.prop b/module.prop
deleted file mode 100644
index b54c18d..0000000
--- a/module.prop
+++ /dev/null
@@ -1,7 +0,0 @@
-id=zaprett
-name=zaprett
-version=4.2
-versionCode=42
-author=egor-white, Huananzhi X99, Cherret
-description=Ускорение CDN серверов Google. ТГК: https://t.me/zaprett_module
-updateJson=https://raw.githubusercontent.com/egor-white/zaprett/refs/heads/main/update.json
diff --git a/customize.sh b/src/customize.sh
similarity index 63%
rename from customize.sh
rename to src/customize.sh
index 3622230..9b33e43 100644
--- a/customize.sh
+++ b/src/customize.sh
@@ -10,16 +10,52 @@ ui_print "(!) To download app, use Telegram chat"
 ui_print "Module by: egorwhite, Huananzhi X99, not_malware"
 ui_print "App by: egorwhite"
 ui_print "####################"
+
 ui_print "Unpacking archive..."
 unzip -o "$ZIPFILE" -x 'META-INF/*' -d $MODPATH >&2
+
 ui_print "Creating zaprett directory..."
 mkdir /sdcard/zaprett; mkdir /sdcard/zaprett/lists; mkdir /sdcard/zaprett/bin; mkdir /sdcard/zaprett/strategies; touch /sdcard/zaprett/config
+
 ui_print "Filling configuration file..."
-echo autorestart=true > /sdcard/zaprett/config; echo activelists=/storage/emulated/0/zaprett/lists/list-youtube.txt,/storage/emulated/0/zaprett/lists/list-discord.txt >> /sdcard/zaprett/config; echo zaprettdir=/sdcard/zaprett >> /sdcard/zaprett/config; echo strategy="" >> /sdcard/zaprett/config
+echo autorestart=true > /sdcard/zaprett/config; echo activelists=/storage/emulated/0/zaprett/lists/list-youtube.txt >> /sdcard/zaprett/config; echo zaprettdir=/sdcard/zaprett >> /sdcard/zaprett/config; echo strategy="" >> /sdcard/zaprett/config
+
 ui_print "Copying lists and binaries to /sdcard/zaprett..."
 cp -r $MODPATH/system/etc/zaprett/. /sdcard/zaprett/
+
+ui_print "Copying files to /bin"
+arch=$(uname -m)
+case "$arch" in
+    "x86_64")
+        nfqws="nfqws_x86_64"
+        ;;
+    "i386"|"i686")
+        nfqws="nfqws_x86"
+        ;;
+    "armv7l"|"arm")
+        nfqws="nfqws_arm32"
+        ;;
+    "aarch64"|"armv8l")
+        nfqws="nfqws_arm64"
+        ;;
+    "mips")
+        nfqws="nfqws_mips"
+        ;;
+    "mipsel")
+        nfqws="nfqws_mipsel"
+        ;;
+    *)
+        ui_print "Unknown arch: $arch"
+        abort
+        ;;
+esac
+cp $nfqws /bin/nfqws
+
 ui_print "Setting permissions..."
 chmod 777 /sdcard/zaprett; chmod 777 $MODPATH/service.sh
+
 ui_print "Cleaning temp files..."
 rm -rf $MODPATH/system/etc/zaprett
+rm -rf $MODPATH/system/bin
+
 ui_print "Installation done. Telegram chat: https://t.me/zaprett_module"
diff --git a/hosts b/src/hosts
similarity index 100%
rename from hosts
rename to src/hosts
diff --git a/service.sh b/src/service.sh
similarity index 100%
rename from service.sh
rename to src/service.sh
diff --git a/zaprett b/src/zaprett
similarity index 86%
rename from zaprett
rename to src/zaprett
index dfb1035..adb36f2 100644
--- a/zaprett
+++ b/src/zaprett
@@ -1,6 +1,5 @@
 #!/system/bin/sh
 source /sdcard/zaprett/config
-arch=$(uname -m)
 
 clear_iptables_rules() {
     iptables -t mangle -D POSTROUTING -j NFQUEUE --queue-num 200 --queue-bypass 2>/dev/null
@@ -8,30 +7,6 @@ clear_iptables_rules() {
     iptables -t filter -D FORWARD -j NFQUEUE --queue-num 200 --queue-bypass 2>/dev/null
 }
 
-case "$arch" in
-    "x86_64")
-        nfqws="nfqws_x86_64"
-        ;;
-    "i386"|"i686")
-        nfqws="nfqws_x86"
-        ;;
-    "armv7l"|"arm")
-        nfqws="nfqws_arm32"
-        ;;
-    "aarch64"|"armv8l")
-        nfqws="nfqws_arm64"
-        ;;
-    "mips")
-        nfqws="nfqws_mips"
-        ;;
-    "mipsel")
-        nfqws="nfqws_mipsel"
-        ;;
-    *)
-        echo "Unknown arch: $arch"
-        exit 1
-        ;;
-esac
 
 if [ "$1" == "start" ]; then
     rm -f /data/adb/modules/zaprett/tmp/*
@@ -68,24 +43,24 @@ fi
     iptables -t mangle -I PREROUTING -j NFQUEUE --queue-num 200 --queue-bypass
     iptables -t filter -A FORWARD -j NFQUEUE --queue-num 200 --queue-bypass
 
-    $nfqws --uid=0:0 --qnum=200 $config > /dev/null & 
+    nfqws --uid=0:0 --qnum=200 $config > /dev/null & 
     echo "zaprett service started!"; return 0;
     fi
 
 if [ "$1" == "stop" ]; then
 clear_iptables_rules
-kill $(pidof $nfqws);
+kill $(pidof nfqws);
 rm -f /data/adb/modules/zaprett/tmp/*
 echo "zaprett service stopped!"; return 0; fi;
 
 if [ "$1" == "status" ]; then
-	pidof "$nfqws" > /dev/null && echo "zaprett is working" || echo "zaprett is stopped"
+	pidof "nfqws" > /dev/null && echo "zaprett is working" || echo "zaprett is stopped"
 fi
 
 if [ "$1" == "restart" ]; then
     echo "Stopping zaprett..."
     clear_iptables_rules
-    kill "$(pidof $nfqws)" 2>/dev/null
+    kill "$(pidof nfqws)" 2>/dev/null
     rm -f /data/adb/modules/zaprett/tmp/*
     echo "Starting zaprett..."
 hostlist=""
@@ -120,7 +95,7 @@ fi
     iptables -t mangle -I PREROUTING -j NFQUEUE --queue-num 200 --queue-bypass
     iptables -t filter -A FORWARD -j NFQUEUE --queue-num 200 --queue-bypass
 
-    $nfqws --uid=0:0 --qnum=200 $config > /dev/null &
+    nfqws --uid=0:0 --qnum=200 $config > /dev/null &
     echo "zaprett service restarted!"
 fi
 if [[ -z $1 ]]; then