View | Details | Raw Unified | Return to bug 7617
Collapse All | Expand All

(-)/usr/X11R6/bin/xscreenlock (-1 / +8 lines)
Lines 20-35 Link Here
20
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
20
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
21
#
21
#
22
22
23
unset n XSCREEN_CUSTOM XSCREEN_SERVER XSCREEN_CLIENT XSCREEN_XLOCK ||:
23
unset n XSCREEN_CUSTOM XSCREEN_SERVER XSCREEN_CLIENT XSCREEN_SERVER_1 XSCREEN_CLIENT_1 XSCREEN_XLOCK ||:
24
XSCREEN_CUSTOM="$HOME/.xscreenlock"
24
XSCREEN_CUSTOM="$HOME/.xscreenlock"
25
XSCREEN_SERVER="/usr/X11R6/bin/xscreensaver"
25
XSCREEN_SERVER="/usr/X11R6/bin/xscreensaver"
26
XSCREEN_CLIENT="/usr/X11R6/bin/xscreensaver-command"
26
XSCREEN_CLIENT="/usr/X11R6/bin/xscreensaver-command"
27
XSCREEN_SERVER_1="/usr/bin/xscreensaver"
28
XSCREEN_CLIENT_1="/usr/bin/xscreensaver-command"
27
XSCREEN_XLOCK="/usr/X11R6/bin/xlock"
29
XSCREEN_XLOCK="/usr/X11R6/bin/xlock"
28
30
29
if [ -x "$XSCREEN_CUSTOM" ]; then
31
if [ -x "$XSCREEN_CUSTOM" ]; then
30
	exec "$XSCREEN_CUSTOM" "$@"
32
	exec "$XSCREEN_CUSTOM" "$@"
31
fi
33
fi
32
34
35
if [ -x "$XSCREEN_SERVER_1" -a -x "$XSCREEN_CLIENT_1" ]; then
36
	XSCREEN_SERVER="XSCREEN_SERVER_1"
37
	XSCREEN_CLIENT="XSCREEN_CLIENT_1"
38
fi
39
33
if [ -x "$XSCREEN_SERVER" -a -x "$XSCREEN_CLIENT" ]; then
40
if [ -x "$XSCREEN_SERVER" -a -x "$XSCREEN_CLIENT" ]; then
34
	if ! "$XSCREEN_CLIENT" -version >/dev/null 2>&1; then
41
	if ! "$XSCREEN_CLIENT" -version >/dev/null 2>&1; then
35
		"$XSCREEN_SERVER" -nosplash </dev/null &
42
		"$XSCREEN_SERVER" -nosplash </dev/null &

Return to bug 7617