r2542 - people/synrg/xjig

[Ben Armstrong]

Author: synrg
Date: 2007-04-07 16:19:21 +0000 (Sat, 07 Apr 2007)
New Revision: 2542

Modified:
   people/synrg/xjig/xjig-menu
Log:
Tighten up trap/Cleanup

Modified: people/synrg/xjig/xjig-menu
===================================================================
--- people/synrg/xjig/xjig-menu	2007-04-07 16:05:21 UTC (rev 2541)
+++ people/synrg/xjig/xjig-menu	2007-04-07 16:19:21 UTC (rev 2542)
@@ -125,7 +125,7 @@
 
 Cleanup ()
 {
-   rm -f "$tmpout"
+   rm -f "$tmperr" "$tmpout"
    if [ $kde_initialized -eq 1 ] ; then
       kdeinit_shutdown
    fi
@@ -371,7 +371,6 @@
       convert -resize $scale "${1}" "$tmpout" 2>"$tmperr"
       CheckError ${?}
       outfile="$tmpout"
-      trap "Cleanup" EXIT HUP INT QUIT BUS PIPE TERM
    else
       outfile="${1}"
    fi
@@ -392,9 +391,11 @@
 Main ()
 {
    typeset -i width=0 height=0 scale_width=0 scale_height=0
-   export kde_initialized=0
    typeset dialog_answer=""
 
+   export kde_initialized=0
+   trap "Cleanup" EXIT HUP INT QUIT BUS PIPE TERM
+
    Defaults
    Arguments "${@}"
    Validate