Mir

Merge lp:~alan-griffiths/mir/use-qterminal into lp:mir

Proposed by Alan Griffiths on 2017-09-06
Status: Merged
Approved by: Brandon Schaefer on 2017-09-06
Approved revision: 4241
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
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

Commit message

Change default launcher for miral-app & miral-desktop to qtubuntu as it works better on artful

To post a comment you must log in.
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:4241
https://mir-jenkins.ubuntu.com/job/mir-ci/3636/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4972
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5200
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5188
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5188
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5188
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5011
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5011/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5011
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5011/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5011
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5011/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5011
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5011/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5011
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5011/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5011
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5011/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5011
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5011/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5011
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5011/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3636/rebuild

review: Approve (continuous-integration)
Brandon Schaefer (brandontschaefer) wrote :

sounds reasonable to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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 #! /bin/bash
6
7 miral_server=miral-shell
8-launcher='gnome-terminal --app-id com.canonical.miral.Terminal'
9+launcher=qterminal
10 hostsocket=
11 bindir=$(dirname $0)
12
13@@ -41,6 +41,9 @@
14
15 if [ -e "${socket}" ]; then echo "Error: session endpoint '${socket}' already exists"; exit 1 ;fi
16
17+qtubuntu_desktop_installed=$(apt list qtubuntu-desktop 2>/dev/null | grep installed | wc -l)
18+if [ "${qtubuntu_desktop_installed}" == "0" ]; then echo "Need qtubuntu-desktop - run \"sudo apt install qtubuntu-desktop\""; exit 1 ;fi
19+
20 sh -c "${bindir}${miral_server} $* ${hostsocket} --file ${socket} --desktop_file_hint=miral-shell.desktop"&
21
22 while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
23
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
29 socket=${XDG_RUNTIME_DIR}/miral_socket
30 miral_server=miral-shell
31-launcher='gnome-terminal --app-id com.canonical.miral.Terminal'
32+launcher=qterminal
33 bindir=$(dirname $0)
34 vt=4
35

Subscribers

People subscribed via source and target branches