xt_geoip_update: Always call the cleanup function when some step fails

Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/src/scripts/xt_geoip_update b/src/scripts/xt_geoip_update
index 6c0b70db02c106e80a2f41d8ff50472b865841ea..ebd2665331c75ac5863e2d455e8cda6a5c37cb07 100644 (file)
--- a/src/scripts/xt_geoip_update
+++ b/src/scripts/xt_geoip_update
@@ -117,27 +117,22 @@ function cleanup() {
 }
 
 function main() {
-       # Download ruleset.
-       download || exit $?
+       local func
+       for func in download install build build_legacy; do
+               if ! ${func}; then
+                       # Cleanup any temporary data
+                       cleanup
 
-       if ! install; then
-               # Do cleanup.
-               cleanup || exit $?
-               exit 1
-       fi
-
-       # Remove temporary files.
-       cleanup || exit $?
-
-       # Convert the ruleset.
-       build || exit $?
+                       return 1
+               fi
+       done
 
-       # Convert GeoIP2 to lagacy.
-       build_legacy || exit $?
+       # Cleanup
+       cleanup || return $?
 
-       # Remove temporary files.
-       cleanup || exit $?
+       # All done
+       return 0
 }
 
 # Run the main function.
-main
+main || exit $?