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"