--- ./xscreenlock.orig 2003-01-24 18:56:23 +0200 +++ ./xscreenlock 2005-08-12 11:47:41 +0300 @@ -20,16 +20,23 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -unset n XSCREEN_CUSTOM XSCREEN_SERVER XSCREEN_CLIENT XSCREEN_XLOCK ||: +unset n XSCREEN_CUSTOM XSCREEN_SERVER XSCREEN_CLIENT XSCREEN_SERVER_1 XSCREEN_CLIENT_1 XSCREEN_XLOCK ||: XSCREEN_CUSTOM="$HOME/.xscreenlock" XSCREEN_SERVER="/usr/X11R6/bin/xscreensaver" XSCREEN_CLIENT="/usr/X11R6/bin/xscreensaver-command" +XSCREEN_SERVER_1="/usr/bin/xscreensaver" +XSCREEN_CLIENT_1="/usr/bin/xscreensaver-command" XSCREEN_XLOCK="/usr/X11R6/bin/xlock" if [ -x "$XSCREEN_CUSTOM" ]; then exec "$XSCREEN_CUSTOM" "$@" fi +if [ -x "$XSCREEN_SERVER_1" -a -x "$XSCREEN_CLIENT_1" ]; then + XSCREEN_SERVER="$XSCREEN_SERVER_1" + XSCREEN_CLIENT="$XSCREEN_CLIENT_1" +fi + if [ -x "$XSCREEN_SERVER" -a -x "$XSCREEN_CLIENT" ]; then if ! "$XSCREEN_CLIENT" -version >/dev/null 2>&1; then "$XSCREEN_SERVER" -nosplash