From 2f9658f7c0cbd8de7597086a4c959b7cbf15fbc6 Mon Sep 17 00:00:00 2001 From: egor-white Date: Sat, 14 Jun 2025 13:53:10 +0300 Subject: [PATCH] refactoring --- .github/workflows/workflow.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 7027f87..d57f1a2 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/checkout@v4 - name: Make build dirs - run: mkdir -p zaprett-default/system/bin zaprett-extended/system/bin zaprett-tv/system/bin zaprett-default/system/etc/zaprett/lists zapret-latest out lists zapret-extended/system/etc/zaprett/lists zapret-tv/system/etc/zaprett/lists + run: mkdir -p zaprett/system/bin zaprett-extended/system/bin zaprett-tv/system/bin zaprett/system/etc/zaprett/lists zapret-latest out lists zapret-extended/system/etc/zaprett/lists zapret-tv/system/etc/zaprett/lists - name: Download latest zapret binaries run: | @@ -46,33 +46,33 @@ jobs: - name: Copy files to dirs run: | #copy nfqws and zaprett - cp zapret-latest/binaries/android-arm/nfqws zaprett-default/system/bin/nfqws_arm32 - cp zapret-latest/binaries/android-arm64/nfqws zaprett-default/system/bin/nfqws_arm64 - cp zapret-latest/binaries/android-x86/nfqws zaprett-default/system/bin/nfqws_x86 - cp zapret-latest/binaries/android-x86_64/nfqws zaprett-default/system/bin/nfqws_x86_64 - cp zapret-latest/binaries/linux-mips/nfqws zaprett-default/system/bin/nfqws_mips - cp zapret-latest/binaries/linux-mipsel/nfqws zaprett-default/system/bin/nfqws_mipsel - #cp src/bin/zaprett zaprett-default/system/bin/ + cp zapret-latest/binaries/android-arm/nfqws zaprett/system/bin/nfqws_arm32 + cp zapret-latest/binaries/android-arm64/nfqws zaprett/system/bin/nfqws_arm64 + cp zapret-latest/binaries/android-x86/nfqws zaprett/system/bin/nfqws_x86 + cp zapret-latest/binaries/android-x86_64/nfqws zaprett/system/bin/nfqws_x86_64 + cp zapret-latest/binaries/linux-mips/nfqws zaprett/system/bin/nfqws_mips + cp zapret-latest/binaries/linux-mipsel/nfqws zaprett/system/bin/nfqws_mipsel + #cp src/bin/zaprett zaprett/system/bin/ - cp -r src/* zaprett-default/ + cp -r src/* zaprett/ #copy all files to another distributions - cp -r zaprett-default/* zaprett-extended/ - cp -r zaprett-default/* zaprett-tv/ + cp -r zaprett/* zaprett-extended/ + cp -r zaprett/* zaprett-tv/ - name: Download and copy actual lists run: | wget https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/lists/list-youtube.txt -O lists/list-youtube.txt wget https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/lists/list-discord.txt -O lists/list-discord.txt wget https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/lists/list-extended.txt -O lists/list-extended.txt - cp lists/list-youtube.txt zaprett-default/system/etc/zaprett/lists/ + cp lists/list-youtube.txt zaprett/system/etc/zaprett/lists/ cp lists/list-youtube.txt zaprett-extended/system/etc/zaprett/lists/ cp lists/list-youtube.txt zaprett-tv/system/etc/zaprett/lists/ - cp lists/list-discord.txt zaprett-default/system/etc/zaprett/lists/ + cp lists/list-discord.txt zaprett/system/etc/zaprett/lists/ cp lists/list-discord.txt zaprett-extended/system/etc/zaprett/lists/ cp lists/list-extended.txt zaprett-extended/system/etc/zaprett/lists/ - name: Tree files run: | - tree zaprett-default/ zaprett-extended/ zaprett-tv/ + tree zaprett/ zaprett-extended/ zaprett-tv/