summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.net>2012-09-10 23:59:29 +0200
committerRené 'Necoro' Neumann <necoro@necoro.net>2012-09-10 23:59:29 +0200
commit878b439fb9dda53e3159ae6e21775d1c22f8643d (patch)
tree95880e642305a5b2dd1f605ba79694c8e5dc315a /templates
parent57120b3a90eaccd38b2c94dd16efee8c5eac05e1 (diff)
downloadplay-878b439fb9dda53e3159ae6e21775d1c22f8643d.tar.gz
play-878b439fb9dda53e3159ae6e21775d1c22f8643d.tar.bz2
play-878b439fb9dda53e3159ae6e21775d1c22f8643d.zip
Split 'prepare' in setupX and prepare -- this allows to cleanup even after killing X
Diffstat (limited to 'templates')
-rw-r--r--templates/cdemu1
-rw-r--r--templates/default12
-rw-r--r--templates/fuseiso1
3 files changed, 12 insertions, 2 deletions
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
}