Changeset 247

Timestamp:

06/11/2008 22:02:44 (4 years ago)

Author:

mattea

Message:

Fixing bad clean exits

File:

• tags/confman-1.7/confman (modified) (5 diffs)

tags/confman-1.7/confman

@@ -22 +22 @@
 fi
 
-trap "conf_cleanExit" EXIT
 # Set a default editor
 if [ -z ${EDITOR} ] ; then
@@ -63 +62 @@
                 echo "Setup failed." >&4
                 conf_unlock_wcopy
-                exit 1
+                return 1
             fi
         else
@@ -940 +939 @@
     then
         echo "Could not fetch the tarball." >&2
-        exit 1
+        return 1
     fi
 
@@ -979 +978 @@
     do
         local livefile="$tmproot${file}"
-        local tmpfile=`${mktemp_file}` || exit 1
+        local tmpfile=`${mktemp_file}` || return 1
         local owner group mode flag livepart msg
         for layer in $LAYERS ; do
@@ -1030 +1029 @@
 subcommand=$1
 shift
+trap "conf_cleanExit" EXIT
 case $subcommand in
-    help )                          print_help "$@" ; exit 0 ;;
+    help )                          print_help "$@" ; trap EXIT; exit 0 ;;
     setup|se* )                     setup "$@" ;;
     status )                        status "$@" ;;