From 2dfc64f9f3137cd7522b32a55e6cbcaa672492f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= <necoro@necoro.net>
Date: Tue, 11 Sep 2012 00:17:13 +0200
Subject: Move WINEDEBUG to play.sh

---
 play.sh           | 11 +++++++----
 templates/default |  1 -
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/play.sh b/play.sh
index db42fd7..cfe21ac 100755
--- a/play.sh
+++ b/play.sh
@@ -3,12 +3,13 @@
 # variables gathered from the environment {{{1
 
 # debugging
-# 0 -> off
-# 1 -> log messages (mostly 'eval' calls) and wine debug
-# 2 -> 1 + xtrace
+# 0 -> off (+ WINEDEBUG=-all)
+# 1 -> log messages (mostly 'eval' calls) (+ WINEDEBUG=-all)
+# 2 -> log messages (+ default WINEDEBUG)
+# 3 -> 2 + xtrace
 PLAY_DEBUG=${PLAY_DEBUG:-0}
 
-[[ $PLAY_DEBUG == 2 ]] && setopt xtrace
+[[ $PLAY_DEBUG == 3 ]] && setopt xtrace
 
 # directory we are in
 PLAY_DIR="${PLAY_DIR:-${0:h}}"
@@ -146,6 +147,8 @@ EXPORT () {
 EENV[WINEPREFIX]='eval echo $PREFIX'
 ENV[DISPLAY]=":1"
 
+[[ $PLAY_DEBUG -le 1 ]] && ENV[WINEDEBUG]="-all"
+
 # phase functions {{{1
 
 # Array of phases
diff --git a/templates/default b/templates/default
index 099ca1d..2f62395 100644
--- a/templates/default
+++ b/templates/default
@@ -12,7 +12,6 @@ default_cleanup () {
     play_cleanup
 }
 
-[[ $PLAY_DEBUG == 0 ]] && ENV[WINEDEBUG]="-all"
 EENV[WINEPREFIX]='{ [[ -z $NO_WINEINSTS ]] && echo $HOME/.wineinsts/$PREFIX; } || echo $PREFIX'
 
 EXPORT setupX prepare cleanup
-- 
cgit v1.2.3