--- a/packaging/linux-installer.inc.in	Wed Sep 17 09:15:47 2014 +0200
+++ b/packaging/linux-installer.inc.in	Wed Sep 17 13:13:11 2014 +0200
@@ -271,12 +271,16 @@
 cleanup()
 {
   getxt "Cleaning up temporary stuff ...\n"
-  # remove temporary directories,
-  # $lock_dir is generate by the shar
-  if [ -z "${lock_dir-}" ]; then
-    exit
+
+  # remove temporary directories:
+  local -a temp_dirs
+  if [ "${lock_dir}" ]; then
+      # $lock_dir is generate by the shar
+      temp_dirs+=("${instcfg[PREFIX]}/$lock_dir")
   fi
-  for dir in "${instcfg[PREFIX]}/$lock_dir" "$extra_bin_path" ; do
+  temp_dirs+=("$extra_bin_path")
+  
+  for dir in "${temp_dirs[@]}" ; do
     [ -d "$dir" ] &&
         rm -rf "$dir"
   done