Merge lp:~alan-griffiths/miral/fix-1675794 into lp:miral

Proposed by Alan Griffiths on 2017-03-24
Status: Merged
Approved by: Gerry Boland on 2017-03-24
Approved revision: 544
Merged at revision: 544
Proposed branch: lp:~alan-griffiths/miral/fix-1675794
Merge into: lp:miral
Diff against target: 53 lines (+5/-7)
4 files modified
miral-shell/miral-app.sh (+2/-4)
miral-shell/miral-desktop.sh (+1/-1)
miral-shell/miral-run.sh (+1/-1)
miral-shell/miral-xrun.sh (+1/-1)
To merge this branch: bzr merge lp:~alan-griffiths/miral/fix-1675794
Reviewer Review Type Date Requested Status
Alberto Aguirre (community) Approve on 2017-03-24
Gerry Boland Approve on 2017-03-24
Cemil Azizoglu (community) 2017-03-24 Approve on 2017-03-24
Review via email: mp+320938@code.launchpad.net

Commit message

[miral-examples] change the server and client launch scripts to avoid using the default Mir socket (LP: #1675794)

To post a comment you must log in.
Cemil Azizoglu (cemil-azizoglu) wrote :

lgtm

review: Approve
lp:~alan-griffiths/miral/fix-1675794 updated on 2017-03-24
544. By Alan Griffiths on 2017-03-24

merge :parent

Gerry Boland (gerboland) :
review: Approve
Alberto Aguirre (albaguirre) wrote :

OK.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'miral-shell/miral-app.sh'
2--- miral-shell/miral-app.sh 2017-02-01 11:11:20 +0000
3+++ miral-shell/miral-app.sh 2017-03-24 15:47:21 +0000
4@@ -11,13 +11,11 @@
5 then
6 echo "Error: Host endpoint '${MIR_SOCKET}' does not exists"; exit 1
7 fi
8- i=0; while [ -e "${XDG_RUNTIME_DIR}/mir_socket${i}" ]; do let i+=1 ;done
9- socket=${XDG_RUNTIME_DIR}/mir_socket${i}
10 hostsocket='--host-socket ${MIR_SOCKET}'
11-else
12- socket=${XDG_RUNTIME_DIR}/mir_socket
13 fi
14
15+socket=${XDG_RUNTIME_DIR}/miral_socket
16+
17 while [ $# -gt 0 ]
18 do
19 if [ "$1" == "--help" -o "$1" == "-h" ]
20
21=== modified file 'miral-shell/miral-desktop.sh'
22--- miral-shell/miral-desktop.sh 2017-02-01 11:11:20 +0000
23+++ miral-shell/miral-desktop.sh 2017-03-24 15:47:21 +0000
24@@ -1,6 +1,6 @@
25 #! /bin/bash
26
27-socket=${XDG_RUNTIME_DIR}/mir_socket
28+socket=${XDG_RUNTIME_DIR}/miral_socket
29 miral_server=miral-shell
30 launcher='gnome-terminal --app-id com.canonical.miral.Terminal'
31 bindir=$(dirname $0)
32
33=== modified file 'miral-shell/miral-run.sh'
34--- miral-shell/miral-run.sh 2016-10-06 15:36:15 +0000
35+++ miral-shell/miral-run.sh 2017-03-24 15:47:21 +0000
36@@ -3,4 +3,4 @@
37 then extras='--app-id com.canonical.miral.Terminal'
38 fi
39 unset QT_QPA_PLATFORMTHEME
40-GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir "$@" ${extras}&
41+MIR_SOCKET=${XDG_RUNTIME_DIR}/miral_socket GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir "$@" ${extras}&
42
43=== modified file 'miral-shell/miral-xrun.sh'
44--- miral-shell/miral-xrun.sh 2017-03-24 13:03:21 +0000
45+++ miral-shell/miral-xrun.sh 2017-03-24 15:47:21 +0000
46@@ -29,6 +29,6 @@
47 shift
48 done
49
50-Xmir -rootless :${port} & pid=$!
51+MIR_SOCKET=${XDG_RUNTIME_DIR}/miral_socket Xmir -rootless :${port} & pid=$!
52 DISPLAY=:${port} "$@"
53 kill ${pid}

Subscribers

People subscribed via source and target branches