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

[Alan Griffiths]

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

[Cemil Azizoglu (cemil-azizoglu)]

lgtm

review: Approve

[lp:~alan-griffiths/miral/fix-1675794]

544. By Alan Griffiths on 2017-03-24

merge :parent

[Gerry Boland (gerboland)]

review: Approve

[Alberto Aguirre (albaguirre)]

OK.

review: Approve

=== modified file 'miral-shell/miral-app.sh'
--- miral-shell/miral-app.sh	2017-02-01 11:11:20 +0000
+++ miral-shell/miral-app.sh	2017-03-24 15:47:21 +0000
@@ -11,13 +11,11 @@
   then
     echo "Error: Host endpoint '${MIR_SOCKET}' does not exists"; exit 1
   fi
-  i=0; while [ -e "${XDG_RUNTIME_DIR}/mir_socket${i}" ]; do let i+=1 ;done
-  socket=${XDG_RUNTIME_DIR}/mir_socket${i}
   hostsocket='--host-socket ${MIR_SOCKET}'
-else
-  socket=${XDG_RUNTIME_DIR}/mir_socket
 fi
 
+socket=${XDG_RUNTIME_DIR}/miral_socket
+
 while [ $# -gt 0 ]
 do
   if [ "$1" == "--help" -o "$1" == "-h" ]
 
=== modified file 'miral-shell/miral-desktop.sh'
--- miral-shell/miral-desktop.sh	2017-02-01 11:11:20 +0000
+++ miral-shell/miral-desktop.sh	2017-03-24 15:47:21 +0000
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-socket=${XDG_RUNTIME_DIR}/mir_socket
+socket=${XDG_RUNTIME_DIR}/miral_socket
 miral_server=miral-shell
 launcher='gnome-terminal --app-id com.canonical.miral.Terminal'
 bindir=$(dirname $0)
 
=== modified file 'miral-shell/miral-run.sh'
--- miral-shell/miral-run.sh	2016-10-06 15:36:15 +0000
+++ miral-shell/miral-run.sh	2017-03-24 15:47:21 +0000
@@ -3,4 +3,4 @@
 then extras='--app-id com.canonical.miral.Terminal'
 fi
 unset QT_QPA_PLATFORMTHEME
-GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir "$@" ${extras}&
+MIR_SOCKET=${XDG_RUNTIME_DIR}/miral_socket GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir "$@" ${extras}&
 
=== modified file 'miral-shell/miral-xrun.sh'
--- miral-shell/miral-xrun.sh	2017-03-24 13:03:21 +0000
+++ miral-shell/miral-xrun.sh	2017-03-24 15:47:21 +0000
@@ -29,6 +29,6 @@
   shift
 done
 
-Xmir -rootless :${port} & pid=$!
+MIR_SOCKET=${XDG_RUNTIME_DIR}/miral_socket Xmir -rootless :${port} & pid=$!
 DISPLAY=:${port} "$@"
 kill ${pid}