diff options
| author | René 'Necoro' Neumann <necoro@necoro.net> | 2012-09-10 23:42:19 +0200 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.net> | 2012-09-10 23:42:19 +0200 |
| commit | c6c87093d3d8857b44faa9c702b45e39c3e473c9 (patch) | |
| tree | e77aa22381a149411a9da271472cfc576c420c9a /templates | |
| parent | 9656b572123893b9f5a1853d1b51f77665047f3a (diff) | |
| download | play-c6c87093d3d8857b44faa9c702b45e39c3e473c9.tar.gz play-c6c87093d3d8857b44faa9c702b45e39c3e473c9.tar.bz2 play-c6c87093d3d8857b44faa9c702b45e39c3e473c9.zip | |
EXPORT now knows the template we are in -- no need to pass it
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/cdemu | 6 | ||||
| -rw-r--r-- | templates/default | 2 | ||||
| -rw-r--r-- | templates/fuseiso | 6 | ||||
| -rw-r--r-- | templates/iso | 12 |
4 files changed, 19 insertions, 7 deletions
diff --git a/templates/cdemu b/templates/cdemu index 81a83b0..f978884 100644 --- a/templates/cdemu +++ b/templates/cdemu @@ -3,7 +3,7 @@ _cdemu_dev () { exc eval "cdemu device-mapping | grep \"^${CDEMU_NO}\" | tr -s ' ' | cut -f 2 -d' '" } -iso_prepare () { +cdemu_prepare () { default_prepare declare -g MOUNT CDEMU_NO @@ -15,11 +15,11 @@ iso_prepare () { exc mount $(_cdemu_dev) } -iso_cleanup () { +cdemu_cleanup () { exc umount $(_cdemu_dev) exc cdemu unload $CDEMU_NO } -EXPORT iso prepare cleanup +EXPORT prepare cleanup # vim:ft=sh diff --git a/templates/default b/templates/default index 9d7d7fc..7e856df 100644 --- a/templates/default +++ b/templates/default @@ -7,6 +7,6 @@ default_prepare () { [[ $PLAY_DEBUG == 0 ]] && ENV[WINEDEBUG]="-all" EENV[WINEPREFIX]='{ [[ -z $NO_WINEINSTS ]] && echo $HOME/.wineinsts/$PREFIX; } || echo $PREFIX' -EXPORT default prepare +EXPORT prepare # vim:ft=sh diff --git a/templates/fuseiso b/templates/fuseiso index 6096b4b..8baf63f 100644 --- a/templates/fuseiso +++ b/templates/fuseiso @@ -1,5 +1,5 @@ -iso_prepare () { +fuseiso_prepare () { default_prepare declare -g MOUNT MOUNTTARGET @@ -9,10 +9,10 @@ iso_prepare () { exc fuseiso -p $MOUNT $MOUNTTARGET } -iso_cleanup () { +fuseiso_cleanup () { exc fusermount -u $MOUNTTARGET } -EXPORT iso prepare cleanup +EXPORT prepare cleanup # vim:ft=sh diff --git a/templates/iso b/templates/iso index ce3fd74..2aad3cd 100644 --- a/templates/iso +++ b/templates/iso @@ -14,4 +14,16 @@ case $ISO_TYPE in *) die "Unknown ISO_TYPE: '$ISO_TYPE'";; esac + +# wrapper phases + +iso_prepare () { + ${ISO_TYPE}_prepare +} + +iso_cleanup () { + ${ISO_TYPE}_cleanup +} + +EXPORT prepare cleanup # vim:ft=sh |