From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel =?utf-8?q?Weism=C3=BCller?= To: development@lists.ipfire.org Subject: [PATCH 4/4] xt_geoip_update: Always call the cleanup function when some step fails Date: Mon, 14 Oct 2019 16:47:56 +0200 Message-ID: <20191014144756.7674-4-daniel.weismueller@ipfire.org> In-Reply-To: <20191014144756.7674-1-daniel.weismueller@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7731602423283285300==" List-Id: --===============7731602423283285300== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Weismüller --- src/scripts/xt_geoip_update | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/src/scripts/xt_geoip_update b/src/scripts/xt_geoip_update index 6c0b70db0..ebd266533 100644 --- 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 $? -- 2.12.2 --===============7731602423283285300==--