From 878b439fb9dda53e3159ae6e21775d1c22f8643d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= <necoro@necoro.net>
Date: Mon, 10 Sep 2012 23:59:29 +0200
Subject: Split 'prepare' in setupX and prepare -- this allows to cleanup even
 after killing X

---
 templates/cdemu   |  1 +
 templates/default | 12 ++++++++++--
 templates/fuseiso |  1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/templates/cdemu b/templates/cdemu
index f978884..f6690a8 100644
--- a/templates/cdemu
+++ b/templates/cdemu
@@ -16,6 +16,7 @@ cdemu_prepare () {
 }
 
 cdemu_cleanup () {
+    default_cleanup
     exc umount $(_cdemu_dev)
     exc cdemu unload $CDEMU_NO
 }
diff --git a/templates/default b/templates/default
index 7e856df..099ca1d 100644
--- a/templates/default
+++ b/templates/default
@@ -1,12 +1,20 @@
-default_prepare () {
+default_setupX () {
     exc nvidia-settings -l
 
+    play_setupX
+}
+
+default_prepare () {
     play_prepare
 }
 
+default_cleanup () {
+    play_cleanup
+}
+
 [[ $PLAY_DEBUG == 0 ]] && ENV[WINEDEBUG]="-all"
 EENV[WINEPREFIX]='{ [[ -z $NO_WINEINSTS ]] && echo $HOME/.wineinsts/$PREFIX; } || echo $PREFIX'
 
-EXPORT prepare
+EXPORT setupX prepare cleanup
 
 # vim:ft=sh
diff --git a/templates/fuseiso b/templates/fuseiso
index 8baf63f..97df277 100644
--- a/templates/fuseiso
+++ b/templates/fuseiso
@@ -10,6 +10,7 @@ fuseiso_prepare () {
 }
 
 fuseiso_cleanup () {
+    default_cleanup
     exc fusermount -u $MOUNTTARGET
 }
 
-- 
cgit v1.2.3