← Back to branch summary

~ci-train-bot/miral/miral-ubuntu-artful-2806

« back to all changes in this revision

Viewing changes to miral-shell/miral-desktop.sh

  • Committer: Bileto Bot
  • Date: 2017-02-15 14:05:17 UTC
  • mfrom: (352.1.3 miral)
  • Revision ID: ci-train-bot@canonical.com-20170215140517-3h16hkkwog2nl0au
https://launchpad.net/bugs/1658117
https://launchpad.net/bugs/1660691
https://launchpad.net/bugs/1660933
https://launchpad.net/bugs/1661256
* New upstream release 1.2.0 (https://launchpad.net/miral/+milestone/1.2)
  - ABI summary:
    . miral ABI unchanged at 2
  - Enhancements:
    . New libmirclientcpp-dev package "C++ wrapper for libmirclient". (Split
      from libmiral-dev)
    . Give miral-app and miral-desktop a good default for -bindir
    . More surface to window renaming to reflect Mir name changes
    . Refresh the "Building and Using MirAL" doc
  - Bugs fixed:
    . Chrome-less shell hint does not work any more (LP: #1658117)
    . WindowSpec::set_state() wrapper for mir_window_spec_set_state()
      (LP: #1661256)
    . "$ miral-app -kiosk" fails with "Unknown command line options: 
      --desktop_file_hint=miral-shell.desktop" (LP: #1660933)
    . libmiral] Fix focus and movement rules for Input Method and Satellite
       windows. (LP: #1660691)
    

Show diffs side-by-side

added added

removed removed

Lines of Context:
miral-shell/miral-desktop.sh
3
3
socket=${XDG_RUNTIME_DIR}/mir_socket
4
4
miral_server=miral-shell
5
5
launcher='gnome-terminal --app-id com.canonical.miral.Terminal'
6
 
bindir=
 
6
bindir=$(dirname $0)
7
7
vt=4
8
8
 
9
9
while [ $# -gt 0 ]
11
11
  if [ "$1" == "--help" -o "$1" == "-h" ]
12
12
  then
13
13
    echo "$(basename $0) - Handy launch script for a miral \"desktop session\""
14
 
    echo "Usage: $0 [options] [shell options]"
 
14
    echo "Usage: $(basename $0) [options] [shell options]"
15
15
    echo "Options are:"
16
16
    echo "    -kiosk               use miral-kiosk instead of ${miral_server}"
17
17
    echo "    -launcher <launcher> use <launcher> instead of '${launcher}'"
18
18
    echo "    -vt       <termid>   set the virtual terminal [${vt}]"
19
19
    echo "    -socket   <socket>   set the mir socket [${socket}]"
20
 
    echo "    -bindir   <bindir>   path to the miral executable"
 
20
    echo "    -bindir   <bindir>   path to the miral executable [${bindir}]"
21
21
    exit 0
22
22
    elif [ "$1" == "-kiosk" ];              then miral_server=miral-kiosk
23
23
    elif [ "$1" == "-launcher" ];           then shift; launcher=$1
29
29
    shift
30
30
done
31
31
 
 
32
if [ "${bindir}" != "" ]; then bindir="${bindir}/"; fi
 
33
 
32
34
if [ -e "${socket}" ]; then echo "Error: '${socket}' already exists"; exit 1 ;fi
33
35
 
34
36
sudo ls >> /dev/null