Improved cleanup of temporary files.

Author: pinhead84

src/lib/app-support/support.tcl

@@ -88,13 +88,11 @@ namespace eval ::support {
     # Detect temporary directory.
     variable TEMP_DIR [file join [::support::utils::get_temp_dir] "temp-support-[pid]"]
     if {![file exists $TEMP_DIR]} {
-      if [catch {file mkdir $TEMP_DIR}] {
-        puts "ERROR: Didn't find temporary directory"
-        puts "ERROR: Couldn't make temporary directory \"$TEMP_DIR\""
+      if {[catch {file mkdir $TEMP_DIR}]} {
+        puts "ERROR: The temporary directory \"$TEMP_DIR\" was not created!"
       }
     } elseif {![file isdirectory $TEMP_DIR]} {
-      puts "ERROR: Didn't find temporary directory"
-      puts "ERROR: Temporary directory \"$TEMP_DIR\" exists, and is not a directory"
+      puts "ERROR: The temporary directory \"$TEMP_DIR\" is not a directory!"
     }
 
     # Print some informations.
@@ -310,6 +308,19 @@ proc exit {} {
   if {$::support::CONNECTED == 1} {
     ::support::disconnect 1
   }
-  file delete -force $::support::TEMP_DIR
+
+  # Remove temporary files explicitly.
+  foreach f [::support::utils::get_files $::support::TEMP_DIR] {
+    if {[file isfile $f] && [catch {file delete -force $f}]} {
+      puts "WARNING: Can't remove temporary file \"$f\"!"
+      puts $::errorInfo
+    }
+  }
+
+  # Remove temporary folder recursively.
+  if {[catch {file delete -force $::support::TEMP_DIR}]} {
+    puts "WARNING: Can't cleanup temporary directory \"$::support::TEMP_DIR\"!"
+    puts $::errorInfo
+  }
   __exit
 }

src/lib/app-support/utils.tcl

@@ -285,4 +285,17 @@ namespace eval ::support::utils {
     }
     error "Can't get application path for this operating system!"
   }
+
+  # Get a recursive list of files in a directory.
+  proc get_files {{dir .}} {
+    set res {}
+    foreach i [lsort [glob -nocomplain -dir $dir *]] {
+      if {[file type $i] eq {directory}} {
+        eval lappend res [get_files $i]
+      } else {
+        lappend res $i
+      }
+    }
+    set res
+  }
 }