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
=== modified file 'examples/miral-shell/miral-app.sh'
--- examples/miral-shell/miral-app.sh 2017-08-21 15:58:34 +0000
+++ examples/miral-shell/miral-app.sh 2017-09-06 16:46:24 +0000
@@ -1,7 +1,7 @@
1#! /bin/bash1#! /bin/bash
22
3miral_server=miral-shell3miral_server=miral-shell
4launcher='gnome-terminal --app-id com.canonical.miral.Terminal'4launcher=qterminal
5hostsocket=5hostsocket=
6bindir=$(dirname $0)6bindir=$(dirname $0)
77
@@ -41,6 +41,9 @@
4141
42if [ -e "${socket}" ]; then echo "Error: session endpoint '${socket}' already exists"; exit 1 ;fi42if [ -e "${socket}" ]; then echo "Error: session endpoint '${socket}' already exists"; exit 1 ;fi
4343
44qtubuntu_desktop_installed=$(apt list qtubuntu-desktop 2>/dev/null | grep installed | wc -l)
45if [ "${qtubuntu_desktop_installed}" == "0" ]; then echo "Need qtubuntu-desktop - run \"sudo apt install qtubuntu-desktop\""; exit 1 ;fi
46
44sh -c "${bindir}${miral_server} $* ${hostsocket} --file ${socket} --desktop_file_hint=miral-shell.desktop"&47sh -c "${bindir}${miral_server} $* ${hostsocket} --file ${socket} --desktop_file_hint=miral-shell.desktop"&
4548
46while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done49while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
4750
=== modified file 'examples/miral-shell/miral-desktop.sh'
--- examples/miral-shell/miral-desktop.sh 2017-08-21 15:58:34 +0000
+++ examples/miral-shell/miral-desktop.sh 2017-09-06 16:46:24 +0000
@@ -2,7 +2,7 @@
22
3socket=${XDG_RUNTIME_DIR}/miral_socket3socket=${XDG_RUNTIME_DIR}/miral_socket
4miral_server=miral-shell4miral_server=miral-shell
5launcher='gnome-terminal --app-id com.canonical.miral.Terminal'5launcher=qterminal
6bindir=$(dirname $0)6bindir=$(dirname $0)
7vt=47vt=4
88

Subscribers

People subscribed via source and target branches