From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] 99-geoip-database: Fix download Date: Mon, 14 Oct 2019 16:43:58 +0000 Message-ID: <20191014164358.17076-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4467989976552578899==" List-Id: --===============4467989976552578899== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This script started a fresh download every time it was called, which is unnecessary. The check to skip the download did not work because it was looking for the old data format. Signed-off-by: Michael Tremer --- .../networking/red.up/99-geoip-database | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/initscripts/networking/red.up/99-geoip-database b/src/initsc= ripts/networking/red.up/99-geoip-database index 335006a69..9b024a8d0 100644 --- a/src/initscripts/networking/red.up/99-geoip-database +++ b/src/initscripts/networking/red.up/99-geoip-database @@ -1,22 +1,19 @@ #!/bin/bash =20 -# Get the GeoIP database if no one exists yet. +# Get the GeoIP database if no one exists yet =20 -DIR=3D"/usr/share/xt_geoip/*" +database_exists() { + local file + for file in /usr/share/xt_geoip/*.iv4; do + [ -e "${file}" ] && return 0 + done =20 -found=3Dfalse - -# Check if the directory contains any data. -for i in $DIR; do - # Ignore "." and ".." - if [ -d "$i" ]; then - found=3Dtrue - break - fi -done + # Does not exist + return 1 +} =20 # Download ruleset if none has been found. -if ! ${found}; then +if ! database_exists; then /usr/local/bin/xt_geoip_update >/dev/null 2>&1 & fi =20 --=20 2.20.1 --===============4467989976552578899==--