export WINESPLASHPROGRESS for control winesplash. do not show splash if WINEDISABLEET...

diff --git a/etersoft/init/config b/etersoft/init/config
index dfafe358d15f70f2c5e6e853791182be1a3fd6ac..c8fa900e3998748b27511b396ccc39e400b2b20d 100644 (file)
--- a/etersoft/init/config
+++ b/etersoft/init/config
@@ -61,6 +61,9 @@ export WINEHOLDSERVER=1800
 # Disable file type associations export from wine
 export WINEDISABLEASSOC=yes
 
+# Disable WINE@Etersoft splash
+#WINEDISABLEETERSPLASH=yes
+
 # Disable annoying fixmes
 if [ -z "$WINEDEBUG" ] ; then
        export WINEDEBUG=fixme-mshtml

diff --git a/etersoft/scripts/wine.in b/etersoft/scripts/wine.in
index 3637869eb2938e9b6d48707cbfae9eda9eb762ca..0c320c412c8b37247e107ca3200dc98fe18d29fb 100644 (file)
--- a/etersoft/scripts/wine.in
+++ b/etersoft/scripts/wine.in
@@ -17,7 +17,7 @@ unset TMPDIR
 [ -z "$WINEPREFIX" ] && export WINEPREFIX=${HOME}/.wine
 
 WINEADMGRP=wineadmin
-PROGRESS=$WINEPREFIX/winesplash.progress
+export WINESPLASHPROGRESS=$WINEPREFIX/winesplash.progress
 WINEDIAG=$BINDIR/winediag
 ETERMSG=$BINDIR/eterx11msg
 WINESERVER=wineserver
@@ -43,7 +43,7 @@ test -z "$INSTALL" && INSTALL=`which install 2>/dev/null`
 
 stop_splash()
 {
-       rm -f "$PROGRESS" 2>/dev/null
+       rm -f "$WINESPLASHPROGRESS" 2>/dev/null
 }
 
 signal_handler() {
@@ -109,11 +109,12 @@ run_wine()
 # color, overall_time, numstep
 init_splash()
 {
+       [ -z "$WINEDISABLEETERSPLASH" ] || return
        i_progress=0
-       echo $i_progress >$PROGRESS
+       echo $i_progress >$WINESPLASHPROGRESS
        local SPLASHFILE=$WINEDATADIR/wine-etersoft-splash.xpm
        [ -r "$SPLASHFILE" ] || SPLASHFILE=$WINEDATADIR/winesplash.xpm
-       $BINDIR/winesplash $PROGRESS $SPLASHFILE $1 $2 2>/dev/null >/dev/null &
+       $BINDIR/winesplash $WINESPLASHPROGRESS $SPLASHFILE $1 $2 2>/dev/null >/dev/null &
        STEPPROGRESS=$3
        export WINEETERSOFTUPDATE=yes
 }
@@ -124,7 +125,7 @@ step_progress()
        if [ $i_progress -ge 100 ] ; then
                i_progress=99
        fi
-       echo $i_progress >$PROGRESS
+       echo $i_progress >$WINESPLASHPROGRESS
 }
 
 map_drive()