1
=== modified file 'examples/miral-shell/miral-xrun.sh'
2
--- examples/miral-shell/miral-xrun.sh	2017-09-29 16:19:42 +0000
3
+++ examples/miral-shell/miral-xrun.sh	2017-10-23 16:05:51 +0000
4
@@ -41,7 +41,6 @@
5
41
  else
41
  else
6
42
    echo "Error: Cannot detect Mir endpoint"; exit 1
42
    echo "Error: Cannot detect Mir endpoint"; exit 1
7
43
  fi
43
  fi
8
44
  MIR_SOCKET=${socket_value}
9
45
  x11_server_args=-rootless
44
  x11_server_args=-rootless
10
46
elif [ "${x11_server}" == "Xwayland" ];
45
elif [ "${x11_server}" == "Xwayland" ];
11
47
then
46
then
12
@@ -51,10 +50,15 @@
13
51
  if [ -e "${XDG_RUNTIME_DIR}/miral_wayland" ];
50
  if [ -e "${XDG_RUNTIME_DIR}/miral_wayland" ];
14
52
  then
51
  then
15
53
    socket_value=miral_wayland
52
    socket_value=miral_wayland
16
53
  elif [ -e "${XDG_RUNTIME_DIR}/wayland-1" ]
17
54
  then
18
55
    socket_value=wayland-1
19
56
  elif [ -e "${XDG_RUNTIME_DIR}/wayland-0" ]
20
57
  then
21
58
    socket_value=wayland-0
22
54
  else
59
  else
23
55
    echo "Error: Cannot detect Mir-Wayland endpoint"; exit 1
60
    echo "Error: Cannot detect Mir-Wayland endpoint"; exit 1
24
56
  fi
61
  fi
25
57
  WAYLAND_DISPLAY=${socket_value}
26
58
  x11_server_args=
62
  x11_server_args=
27
59
fi
63
fi
28
60
64
29
@@ -64,6 +68,7 @@
30
64
    let port+=1
68
    let port+=1
31
65
done
69
done
32
66
70
34
67
${x11_server} ${x11_server_args} :${port} & pid=$!
71
MIR_SOCKET=${socket_value} WAYLAND_DISPLAY=${socket_value} ${x11_server} ${x11_server_args} :${port} & pid=$!
35
72
while [ ! -e "/tmp/.X11-unix/X${port}" ]; do echo "waiting for DISPLAY=:${port}"; sleep 1 ;done
36
68
DISPLAY=:${port} "$@"
73
DISPLAY=:${port} "$@"
37
69
kill ${pid}
74
kill ${pid}
Status:	Merged
Approved by:	Alan Griffiths on 2017-10-25
Approved revision:	no longer in the source branch.
Merged at revision:	4303
Proposed branch:	lp:~alan-griffiths/mir/fix-miral-xrun
Merge into:	lp:mir
Diff against target:	37 lines (+8/-3) 1 file modified examples/miral-shell/miral-xrun.sh (+8/-3)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/fix-miral-xrun
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2017-10-25
Brandon Schaefer (community)		2017-10-23	Approve on 2017-10-24
Review via email: mp+332653@code.launchpad.net