]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
xt_geoip_update: Fix mktemp calls.
authorStefan Schantl <stefan.schantl@ipfire.org>
Tue, 17 Feb 2015 07:41:16 +0000 (08:41 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Tue, 17 Feb 2015 07:41:16 +0000 (08:41 +0100)
src/scripts/xt_geoip_update

index 3ad34d0c6d74633c818a66261cce6bec0f7367a0..294af58e0a60a56b48845225f2644429fa70d452 100644 (file)
@@ -20,7 +20,7 @@
 ###############################################################################
 
 TMP_PATH=$(mktemp -d)
-TMP_FILE=$(mktemp)
+TMP_FILE=$(mktemp -p $TMP_PATH)
 
 SCRIPT_PATH=/usr/libexec/xtables-addons
 DEST_PATH=/usr/share/xt_geoip
@@ -35,11 +35,14 @@ ARCH=LE
 function download() {
        echo "Downloading latest GeoIP ruleset..."
 
+       # Create temporary directory.
+       mkdir -pv $TMP_PATH
+
        # Get the latest GeoIP database from server.
-       wget $DL_URL/$DL_FILE -O $TMP_PATH/$TMP_FILE
+       wget $DL_URL/$DL_FILE -O $TMP_FILE
 
        # Extract files.
-       unzip $TMP_PATH/$TMP_FILE -d $TMP_PATH
+       unzip $TMP_FILE -d $TMP_PATH
 
        return 0
 }
@@ -55,7 +58,7 @@ function build() {
 
        # Run script to convert the CSV file into several xtables
        # compatible binary files.
-       if ! $SCRIPT_PATH/xt_geoip_build $TMP_DIR/$CSV_FILE -D $TMP_DIR; then
+       if ! $SCRIPT_PATH/xt_geoip_build $TMP_PATH/$CSV_FILE -D $TMP_PATH; then
                echo "Could not convert ruleset. Aborting." >&2
                return 1
        fi