diff options
Diffstat (limited to 'abs/core/LinHES-system/LinHES-session')
| -rwxr-xr-x | abs/core/LinHES-system/LinHES-session | 43 |
1 files changed, 26 insertions, 17 deletions
diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session index e181a1a..01768bd 100755 --- a/abs/core/LinHES-system/LinHES-session +++ b/abs/core/LinHES-system/LinHES-session @@ -3,6 +3,13 @@ MYTH_RUN_STATUS="1" . /etc/profile . /etc/systemconfig + +#set some defaults, then override from /etc/X11/WINDOWMANAGER +configdir="/usr/share/wm_data" +WM="e16 -P $configdir/e16_config_dir/" +STARTUP_STYLE=enhanced + + if [ -e /etc/X11/WINDOWMANAGER ] then . /etc/X11/WINDOWMANAGER @@ -129,7 +136,7 @@ function fluxbox_settings(){ then echo "setting symlink fluxbox" configdir=/usr/share/fluxbox_settings - ln -s $configdir /root/.fluxbox + ln -s $configdir $HOME/.fluxbox fi } @@ -238,7 +245,7 @@ function update_apple_trailers(){ function first_configure(){ - if [ x$STARTUP_STYLE = xenhanced ] + if [ ! x$STARTUP_STYLE = xlegacy ] then first_configure_mv else @@ -351,7 +358,7 @@ function start_myth() { fi #continue on with starting mythtv - if [ x$STARTUP_STYLE = xenhanced ] + if [ ! x$STARTUP_STYLE = xlegacy ] then start_myth_mv else @@ -398,7 +405,7 @@ function run_myth(){ killall -9 irexec /usr/bin/irexec -d - if [ x$STARTUP_STYLE = xenhanced ] + if [ ! x$STARTUP_STYLE = xlegacy ] then run_wmctrl & @@ -427,18 +434,19 @@ function set_background() } -if [ x"$WM" = "xdefault" ] -then -# fluxbox > /var/log/fluxbox.log 2>&1 - WM=fluxbox -fi - - -if [ x"$WM" = "x" ] -then -# fluxbox > /var/log/fluxbox.log 2>&1 - WM=fluxbox -fi +# if [ x"$WM" = "xdefault" ] +# then +# # fluxbox > /var/log/fluxbox.log 2>&1 +# WM=fluxbox +# fi +# +# +# if [ x"$WM" = "x" ] +# then +# # fluxbox > /var/log/fluxbox.log 2>&1 +# WM=fluxbox +# fi +# if [ $WM = "fluxbox" ] then @@ -446,6 +454,7 @@ then fi + #if using mythvantage style, start the WM right away # this is done so that starting mythtv can loop. $WM & @@ -467,7 +476,7 @@ start_myth # wait for the windowmanger #This will make the session wait on the WM to exit. -if [ x$STARTUP_STYLE != xenhanced ] +if [ x$STARTUP_STYLE = xlegacy ] then wait $pid fi |