[arch-projects] [netcfg] [PATCH 1/2] Defensively remove temporary file in EXIT trap

21 Jun 2012

Signed-off-by: Henrik Hallberg <halhen@k2h.se>
---
 scripts/netcfg-menu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/netcfg-menu b/scripts/netcfg-menu
index d0db762..a3bab94 100755
--- a/scripts/netcfg-menu
+++ b/scripts/netcfg-menu
@@ -30,6 +30,7 @@ fi
 # if no default yet, use the first entry
 [[ -z "$DEFAULT" ]] && DEFAULT="${profiles[0]}"
 ANSWER=$(mktemp --tmpdir menu.XXXXXXXX) || exit 1
+trap "rm -f $ANSWER" EXIT
 
 # Set timeout
 if [[ -z "$1" ]]; then
@@ -60,7 +61,6 @@ case $ret in
         exit_err "Abnormal ret code from dialog: $ret"
         ;;
 esac
-rm -f "$ANSWER"     # JP: add -f
 exit $ret           # JP: exit with caught $?
 
 # vim: ft=sh ts=4 et sw=4:
-- 
1.7.11

    