1
=== modified file 'examples/miral-shell/miral-app.sh'
2
--- examples/miral-shell/miral-app.sh	2017-08-21 15:58:34 +0000
3
+++ examples/miral-shell/miral-app.sh	2017-09-06 16:46:24 +0000
4
@@ -1,7 +1,7 @@
5
1
#! /bin/bash
1
#! /bin/bash
6
2
2
7
3
miral_server=miral-shell
3
miral_server=miral-shell
9
4
launcher='gnome-terminal --app-id com.canonical.miral.Terminal'
4
launcher=qterminal
10
5
hostsocket=
5
hostsocket=
11
6
bindir=$(dirname $0)
6
bindir=$(dirname $0)
12
7
7
13
@@ -41,6 +41,9 @@
14
41
41
15
42
if [ -e "${socket}" ]; then echo "Error: session endpoint '${socket}' already exists"; exit 1 ;fi
42
if [ -e "${socket}" ]; then echo "Error: session endpoint '${socket}' already exists"; exit 1 ;fi
16
43
43
17
44
qtubuntu_desktop_installed=$(apt list qtubuntu-desktop 2>/dev/null | grep installed | wc -l)
18
45
if [ "${qtubuntu_desktop_installed}" == "0" ]; then echo "Need qtubuntu-desktop - run \"sudo apt install qtubuntu-desktop\""; exit 1 ;fi
19
46
20
44
sh -c "${bindir}${miral_server} $* ${hostsocket} --file ${socket} --desktop_file_hint=miral-shell.desktop"&
47
sh -c "${bindir}${miral_server} $* ${hostsocket} --file ${socket} --desktop_file_hint=miral-shell.desktop"&
21
45
48
22
46
while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
49
while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
23
47
50
24
=== modified file 'examples/miral-shell/miral-desktop.sh'
25
--- examples/miral-shell/miral-desktop.sh	2017-08-21 15:58:34 +0000
26
+++ examples/miral-shell/miral-desktop.sh	2017-09-06 16:46:24 +0000
27
@@ -2,7 +2,7 @@
28
2
2
29
3
socket=${XDG_RUNTIME_DIR}/miral_socket
3
socket=${XDG_RUNTIME_DIR}/miral_socket
30
4
miral_server=miral-shell
4
miral_server=miral-shell
32
5
launcher='gnome-terminal --app-id com.canonical.miral.Terminal'
5
launcher=qterminal
33
6
bindir=$(dirname $0)
6
bindir=$(dirname $0)
34
7
vt=4
7
vt=4
35
8
8
Status:	Merged
Approved by:	Brandon Schaefer on 2017-09-06
Approved revision:	no longer in the source branch.
Merged at revision:	4241
Proposed branch:	lp:~alan-griffiths/mir/use-qterminal
Merge into:	lp:mir
Diff against target:	34 lines (+5/-2) 2 files modified examples/miral-shell/miral-app.sh (+4/-1) examples/miral-shell/miral-desktop.sh (+1/-1)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/use-qterminal
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Brandon Schaefer (community)		2017-09-06	Approve on 2017-09-06
Mir CI Bot	continuous-integration		Approve on 2017-09-06
Review via email: mp+330304@code.launchpad.net