diff options
| -rw-r--r-- | abs/core-testing/LinHES-config/PKGBUILD | 2 | ||||
| -rwxr-xr-x | abs/core-testing/LinHES-config/systemconfig.sh | 34 | ||||
| -rw-r--r-- | abs/core-testing/LinHES-system/LinHES-run | 11 | ||||
| -rw-r--r-- | abs/core-testing/LinHES-system/PKGBUILD | 4 | 
4 files changed, 47 insertions, 4 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index a957c59..91fc92c 100644 --- a/abs/core-testing/LinHES-config/PKGBUILD +++ b/abs/core-testing/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@  pkgname=LinHES-config  pkgver=1.0 -pkgrel=299 +pkgrel=306  conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev )  pkgdesc="Install and configure your system"  depends=(bc libstatgrab  mysql-python expect curl dnsutils parted sg3_utils nmbscan system-templates ) diff --git a/abs/core-testing/LinHES-config/systemconfig.sh b/abs/core-testing/LinHES-config/systemconfig.sh index 19cdbf9..07ca7c6 100755 --- a/abs/core-testing/LinHES-config/systemconfig.sh +++ b/abs/core-testing/LinHES-config/systemconfig.sh @@ -736,6 +736,13 @@ else             ser_remove="inadyn $ser_remove"  fi +if [ x$XScreensaver = x1 ] +then +           ser_install="xscreensaver $ser_install" +else +           ser_remove="xscreensaver $ser_remove" +fi +  #Setting the default, just to avoid the or statement.. @@ -1076,7 +1083,33 @@ function setup_web_auth {  } +function setupXscreensaver { +#copy in template +    if [ -f /home/mythtv/.xscreensaver ] +    then +        echo "Xscreensaver already configured" +    else +        #copy in template +        cp $TEMPLATES/xscreensaver.template /home/mythtv/.xscreensaver +        chown mythtv:users  /home/mythtv/.xscreensaver +    fi +#start it if not already running. +    if [ x$XScreensaver = x1 ] +    then +        #check if it's running, it not start it. +        if [ ! x$MV_NEW_INSTALL = "xtrue" ] +        then +            su - mythtv -c "/usr/bin/xscreensaver -nosplash &" +        fi +    else +        #kill it +        xscreensaver-command -exit & +        killall xscreensaver & +    fi + + +}  #----------------------------------------------------MAIN PROGRAM-------------------------------------------  #misc,sleep,hostype,advanced,audio  eval LAST=\$$# @@ -1333,6 +1366,7 @@ then      setupblaster      setupLCD      setupDNSMASQ +    setupXscreensaver  fi diff --git a/abs/core-testing/LinHES-system/LinHES-run b/abs/core-testing/LinHES-system/LinHES-run index 8b4a9f5..8de7a4b 100644 --- a/abs/core-testing/LinHES-system/LinHES-run +++ b/abs/core-testing/LinHES-system/LinHES-run @@ -5,7 +5,16 @@  #keylaunch &  #/usr/bin/tilda & -/usr/X11R6/bin/unclutter -root -idle 0 -jitter 400 -noevents  & +#move mouse to corner +xdotool mousemove -10 -10 +/usr/X11R6/bin/unclutter -root -idle 1 -jitter 200 -noevents  & +if [ x"$XScreensaver" = "x1" ] +then +    #start xscreensaver +   xscreensaver-command -exit +   xscreensaver -nosplash & +fi +  /usr/bin/xvattr -a XV_COLORKEY -v 0  mtd &  #/usr/bin/nvidia-settings -l diff --git a/abs/core-testing/LinHES-system/PKGBUILD b/abs/core-testing/LinHES-system/PKGBUILD index 15ee559..348ee10 100644 --- a/abs/core-testing/LinHES-system/PKGBUILD +++ b/abs/core-testing/LinHES-system/PKGBUILD @@ -1,12 +1,12 @@  pkgname=LinHES-system  pkgver=1.0 -pkgrel=35 +pkgrel=39  arch=('i686')  MVDIR=$startdir/pkg/usr/LH  BINDIR=$startdir/pkg/usr/bin  install=LinHES.install  pkgdesc="scripts and things related to having a automated system" -depends=(linhes-sounds) +depends=(linhes-sounds xdotool)  binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh LinHES-run firstboot.sh load-modules-mythvantage.sh"  | 
