From ab5d32a1d8747c281b473853939243055e89a284 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 27 Oct 2009 03:51:02 +0100 Subject: [PATCH] xbmc: - various cleanups --- packages/mediacenter/xbmc/xinitrc.d/99_xbmc | 36 +++++++++++---------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/packages/mediacenter/xbmc/xinitrc.d/99_xbmc b/packages/mediacenter/xbmc/xinitrc.d/99_xbmc index 91b62e7cef..b13609d6c0 100755 --- a/packages/mediacenter/xbmc/xinitrc.d/99_xbmc +++ b/packages/mediacenter/xbmc/xinitrc.d/99_xbmc @@ -11,7 +11,6 @@ export XBMC_HOME="/usr/share/xbmc" args="--standalone -fs --lircdev $LIRC_OUTPUT" -LOOP=1 print_crash_report() { @@ -28,12 +27,7 @@ print_crash_report() echo -n " Kernel: " >> $FILE uname -rvs >> $FILE echo -n " Release: " >> $FILE - if which lsb_release &> /dev/null; then - echo >> $FILE - lsb_release -a 2> /dev/null | sed -e 's/^/ /' >> $FILE - else - echo "lsb_release not available" >> $FILE - fi + cat /etc/openelec-release >> $FILE echo "############## END SYSTEM INFO ##############" >> $FILE echo >> $FILE echo "############### STACK TRACE #################" >> $FILE @@ -60,23 +54,31 @@ print_crash_report() ulimit -c unlimited -while true; do +while true +do DISPLAY=:0.0 /usr/bin/xbmc ${args} > /dev/null 2>&1 RET=$? echo "Exited with code $RET" - if [[ $RET >= 131 && $RET <= 136] || $RET == 139 ]; then - print_crash_report - elif [ $RET == 0 ]; then - break - elif [ $RET == 64 ]; then + + if [ "$RET" == 0 ]; then break + + elif [ "$RET" == 64 ]; then sync poweroff - break - elif [ $RET == 65 || $RET == 66 ]; then - break + + elif [ "$RET" == 65 ]; then + LOOP=1 + + elif [ "$RET" == 66 ]; then sync reboot - break + + elif [ "$RET" >= 131 ] && [ "$RET" <= 136 ]; then + print_crash_report + + elif [ "$RET" == 139 ]; then + print_crash_report + fi done