From 3cb5d1b5ee11870c1132c38f178f73f2725f0008 Mon Sep 17 00:00:00 2001 From: Miwory Date: Fri, 17 Apr 2026 03:03:31 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20all.txt=20=D0=B4=D0=BB=D1=8F=20=D0=B0=D0=B9=D0=BF?= =?UTF-8?q?=D0=B8=20=D1=81=D0=B5=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/all.sh | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/scripts/all.sh b/scripts/all.sh index fefec9a..6e60487 100644 --- a/scripts/all.sh +++ b/scripts/all.sh @@ -1,12 +1,20 @@ #!/bin/sh -SOURCE_DIR="/usr/share/nginx/html/lists" -OUTPUT_FILE="$SOURCE_DIR/all.txt" -TEMP_FILE=$(mktemp) +IPSETS_SOURCE_DIR="/usr/share/nginx/html/ipsets" +IPSETS_OUTPUT_FILE="$IPSETS_SOURCE_DIR/all.txt" -find "$SOURCE_DIR" -maxdepth 1 -name "*.txt" ! -name "all.txt" -exec awk 1 {} + > "$TEMP_FILE" +LISTS_SOURCE_DIR="/usr/share/nginx/html/lists" +LISTS_OUTPUT_FILE="$LISTS_SOURCE_DIR/all.txt" -sed 's/#.*//g' "$TEMP_FILE" | sed 's/\r//' | grep -v '^$' | sort -u > "$OUTPUT_FILE" +IPSETS_TEMP_FILE=$(mktemp) +LISTS_TEMP_FILE=$(mktemp) + +find "$IPSETS_SOURCE_DIR" -maxdepth 1 -name "*.txt" ! -name "all.txt" -exec awk 1 {} + > "$IPSETS_TEMP_FILE" +find "$LISTS_SOURCE_DIR" -maxdepth 1 -name "*.txt" ! -name "all.txt" -exec awk 1 {} + > "$LISTS_TEMP_FILE" + +sed 's/#.*//g' "$IPSETS_TEMP_FILE" | sed 's/\r//' | grep -v '^$' | sort -u > "$IPSETS_TEMP_FILE" +sed 's/#.*//g' "$LISTS_TEMP_FILE" | sed 's/\r//' | grep -v '^$' | sort -u > "$LISTS_TEMP_FILE" # Cleanup -rm "$TEMP_FILE" +rm "$IPSETS_TEMP_FILE" +rm "$LISTS_TEMP_FILE"