From 933a93e4a71591e867182999a7daf8ae3bad5596 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= <necoro@necoro.net>
Date: Fri, 15 Feb 2013 12:34:32 +0100
Subject: Major overhaul: Support non-wine games

* Moved wine support to own template
* Added xpad template
* Added no-x template for games that don't support being started
  on another X.
* Improved ways template functions work together:
    - EXPORT now appends
    - OVERRIDE replaces all the others
    - in game: command 'super' to call the phases of the templates
    - super supports "-r tpl" to remove the phase function of tpl
---
 templates/iso | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'templates/iso')

diff --git a/templates/iso b/templates/iso
index 2aad3cd..2b65c26 100644
--- a/templates/iso
+++ b/templates/iso
@@ -1,3 +1,6 @@
+#
+# NB: MUST be included before other templates defining cleanup and prepare
+#
 
 if [[ -z $ISO_TYPE ]]; then
     # default
@@ -18,12 +21,16 @@ esac
 # wrapper phases
 
 iso_prepare () {
+    default_prepare
     ${ISO_TYPE}_prepare
 }
 
 iso_cleanup () {
+    default_cleanup
     ${ISO_TYPE}_cleanup
 }
 
-EXPORT prepare cleanup
+# we need to OVERRIDE and not EXPORT, to not execute them twice
+# as they are already exported in the other template
+OVERRIDE prepare cleanup
 # vim:ft=sh
-- 
cgit v1.2.3