[StartEnigma] make twisted debug log path configurable

lib/python/StartEnigma.py

@@ -2,6 +2,7 @@
 from os import chmod
 from os import path as os_path
 from os import system
+from os import getenv
 from sys import path as sys_path
 from time import localtime, strftime, time
 
@@ -70,7 +71,7 @@ def setLoadUnlinkedUserbouquets(configElement):
 
 config.misc.enabletwistedlog = ConfigYesNo(default=False)
 if config.misc.enabletwistedlog.value == True:
-	log.startLogging(open('/home/root/logs/Enigma2-twisted.log', 'w'))
+	log.startLogging(open('%s/twisted.log' % getenv('LOGFOLDER'), 'w'))
 
 profile("LOAD:Tools")
 from Components.config import (ConfigInteger, ConfigSelection, ConfigText,

tools/enigma2.sh.in

@@ -94,18 +94,19 @@ fi
 
 export LC_CTYPE="en_US.UTF-8"
 
+LOGFOLDER="/home/root/logs/"
+export LOGFOLDER
 if [ "$(grep -i config.crash.enabledebug=true /etc/enigma2/settings)" != "" ]; then
 	DEBUG_LVL='4'
 	RANDOMIZE1970=''
 	time=`date +%Y` ;
 	if [ "$time" = 1970 ]; then
 		RANDOMIZE1970="$(strings /dev/urandom | grep -o '[[:alnum:]]' | head -n 5 | tr -d '\n')"
 	fi
-	LOGFOLDER="/home/root/logs/"
 	if [ "$(grep config.crash.debug_path= /etc/enigma2/settings | sed 's/config.crash.debug_path=//g')" != "" -a -d "$(grep config.crash.debug_path= /etc/enigma2/settings | sed 's/config.crash.debug_path=//g')" ]; then
 		LOGFOLDER=$(grep config.crash.debug_path= /etc/enigma2/settings | sed 's/config.crash.debug_path=//g')
+		export LOGFOLDER
 	fi
-	export LOGFOLDER
 	LOGFILE=${LOGFOLDER}Enigma2-debug-$(date +%Y%m%d_%H-%M-%S)${RANDOMIZE1970}.log
 	if [ ! -d $LOGFOLDER ] ; then mkdir -p $LOGFOLDER; fi
 	ln -sf ${LOGFILE} ${LOGFOLDER}currlog