This commit is contained in:
Casper Ti. Vector 2012-08-23 13:33:34 +08:00
commit 723149c6bd
2 changed files with 5 additions and 3 deletions

View File

@ -145,7 +145,9 @@ case ${flaglist[$binindex]} in
while ((display < 7)); do while ((display < 7)); do
if dpyinfo=$(xdpyinfo -display ":$display.0" 2>&1 1>/dev/null) || if dpyinfo=$(xdpyinfo -display ":$display.0" 2>&1 1>/dev/null) ||
# Display is in use by another user. # Display is in use by another user.
[[ "$dpyinfo" == 'No protocol specified'* ]] [[ "$dpyinfo" == 'No protocol specified'* ]] ||
# Invalid MIT cookie.
[[ "$dpyinfo" == 'Invalid MIT'* ]]
then then
let display+=1 let display+=1
else else

View File

@ -79,8 +79,8 @@ fi
# Conform to POSIX and do not use `>&' here. # Conform to POSIX and do not use `>&' here.
sh -i -c "(startx $* > /dev/null 2>&1 &)" sh -i -c "(startx $* > /dev/null 2>&1 &)"
# If wait(1) returns with a value >128, it was interrupted by kill(1), so # If wait(1) returns with a value >128, it was interrupted by kill(1),
# registration was sucessful. # so registration was sucessful.
if [[ -n "$clockpid" ]]; then if [[ -n "$clockpid" ]]; then
if wait "$clockpid" >& /dev/null if wait "$clockpid" >& /dev/null
then then