From 8446328bc670e3d57fad719afc7610c7b5680fb3 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Sat, 5 Feb 2011 19:32:29 +0100
Subject: [PATCH] Implement automatic temp removal

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 bin/cdist-config | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/bin/cdist-config b/bin/cdist-config
index a489d020..dd07a3c4 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -21,6 +21,7 @@
 # Print configuration directories - helper for all other scripts
 #
 
+
 # Values can be overriden from outside, so you can
 # customise paths as you like (for distributors, geeks and hackers)
 : ${__cdist_config:=/etc/cdist}
@@ -46,10 +47,11 @@ export __cdist_remote_explorer_dir
 export __cdist_remote_cache_explorer
 : ${__cdist_remote_cache_bin:=$__cdist_remote_base_dir/bin}
 
-# create basedir + tempfile for direct usage
-# FIXME: remove on exit
-: ${__cdist_tmp_dir:=$(mktemp -d "/tmp/cdist.XXXXXXXXXXXX")}
-: ${__cdist_tmp_file:=$(mktemp "$__cdist_tmp_dir/cdist.XXXXXXXXXXXX")}
+# Tempfiles need to be recreated for each individual script, unshared!
+__cdist_tmp_dir=$(mktemp -d "/tmp/cdist.XXXXXXXXXXXX")
+export __cdist_tmp_dir
+__cdist_tmp_file=$(mktemp "$__cdist_tmp_dir/cdist.XXXXXXXXXXXX")
+export __cdist_tmp_file
 
 ################################################################################
 # cconf standard vars prefixed with cdist
@@ -72,6 +74,7 @@ __cdist_sane_regexp='[A-Za-z0-9]*[-A-Za-z0-9_]*'
 # Used to mark file that created a specific type
 __cdist_object_source=".source"
 
+
 ################################################################################
 # Function list
 #
@@ -97,3 +100,13 @@ __cdist_cache_host()
 {
    echo "${__cdist_cache_hosts}/${__cdist_target_host}"
 }
+
+__cdist_tmp_removal()
+{
+   rm -rf "${__cdist_tmp_dir}"
+}
+
+################################################################################
+# Trap for tmp removal
+#
+trap __cdist_tmp_removal EXIT