X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver.kss;h=5c397f65dccc33f9a463d895c8e6fe167f1b7d59;hb=13dbc569cdc6e29019722c0ef9b932a925efbcad;hp=dac4d9841ca9c7687f4b3f950449078044814788;hpb=06e9a7886a77cad92f9ddbc169d6d199a4d8b76d;p=xscreensaver diff --git a/driver/xscreensaver.kss b/driver/xscreensaver.kss index dac4d984..5c397f65 100755 --- a/driver/xscreensaver.kss +++ b/driver/xscreensaver.kss @@ -33,14 +33,14 @@ while [ -n "$1" ]; do ;; -preview) - # This simply runs xroger in the preview window. For this to be "real", + # This simply runs xflame in the preview window. For this to be "real", # it needs to run xscreensaver with a -window-id parameter for each hack. # There are two ways to do this: # 1) Hack xscreensaver to allow global parameters. # 2) Hack xscreensaver to accept alternate setup files, and create one on # the fly here. shift - /usr/X11R6/lib/xscreensaver/xroger -delay 1 -window-id $1 & # Start new preview + /usr/X11R6/lib/xscreensaver/xflame -delay 1 -window-id $1 & # Start new preview echo "$!" > $HOME/.kss-preview$1.pid.`hostname` # Write PID wait $! # Wait for it to get killed exit @@ -104,9 +104,10 @@ while [ -n "$1" ]; do done if [ -n "$Install" ] ; then - rm $HOME/.kss-preview* # Remove old preview files PID_FILE=$HOME/.kss-install.pid.`hostname` - kill `cat $PID_FILE` # Kill old screensaver + if [ -r "$PID_FILE" ] ; then + kill `cat $PID_FILE` # Kill old screensaver + fi echo "$$" > $PID_FILE # Write PID of this script /usr/X11R6/bin/xscreensaver -no-splash $timeout $lockmode $Nice & # Start XScreenSaver daemon trap "kill $!" SIGTERM # Set these to kill the daemon