Skip to content
Snippets Groups Projects
Commit e070ee1e authored by Simon McVittie's avatar Simon McVittie
Browse files

Add an easier way to select the scout runtime

parent f00cf5c1
No related branches found
No related tags found
No related merge requests found
......@@ -310,16 +310,38 @@ Instructions for testing
* For a more production-ready version without the test UI, set the launch
options to:
"LaunchOptions" "~/.steam/steam/steamapps/common/SteamLinuxRuntime/pressure-vessel/bin/pressure-vessel-unruntime-scout -- %command%"
This mode does not require Python 3, PyGI, GTK or a normal
window manager, and is probably more suitable for Big Picture mode.
It assumes this directory layout:
```
SteamLinuxRuntime
\- pressure-vessel
\- bin
\- pressure-vessel-unruntime-scout (etc.)
\- scout
\- files
\- metadata
```
Or for more flexibility, use
"LaunchOptions" "~/.steam/steam/steamapps/common/SteamLinuxRuntime/pressure-vessel/bin/pressure-vessel-unruntime -- %command%"
and then add more options just before the `--` as desired.
This mode does not require Python 3, PyGI, GTK or a normal
window manager, and is probably more suitable for Big Picture mode.
* When not using the test UI, the default runtime is the host system,
* The default runtime for `pressure-vessel-unruntime` is the host system,
with the `LD_LIBRARY_PATH` Steam Runtime overlaid onto it.
You can specify a runtime with the `--runtime` option. It can be
any of these:
You can specify a runtime with the `--runtime` option:
`pressure-vessel-unruntime-scout` is just a shortcut for using
`pressure-vessel-unruntime --runtime DIR/../../scout/files` where *DIR*
is the directory containing `pressure-vessel-unruntime-scout` itself.
The runtime can be any of these:
- The `files` subdirectory of a Flatpak-style runtime such as
`~/.steam/steam/steamapps/common/SteamLinuxRuntime/scout` or
......
......@@ -98,6 +98,7 @@ PRIMARY_ARCH_DEPENDENCIES = {
SCRIPTS = [
'pressure-vessel-test-ui',
'pressure-vessel-unruntime',
'pressure-vessel-unruntime-scout',
'pressure-vessel-unruntime-test-ui',
]
EXECUTABLES = [
......
......@@ -109,6 +109,7 @@ add_project_arguments(supported_warning_cflags, language : 'c')
scripts = [
'pressure-vessel-test-ui',
'pressure-vessel-unruntime',
'pressure-vessel-unruntime-scout',
'pressure-vessel-unruntime-test-ui',
]
......
#!/bin/bash
# pressure-vessel-scout — undo the Steam Runtime's environment and use
# scout, assuming the layout of the SteamLinuxRuntime depot.
#
# Copyright © 2019 Collabora Ltd.
#
# SPDX-License-Identifier: MIT
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish,
# distribute, sublicense, and/or sell copies of the Software, and to
# permit persons to whom the Software is furnished to do so, subject to
# the following conditions:
#
# The above copyright notice and this permission notice shall be included
# in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
set -e
set -o pipefail
set -u
shopt -s nullglob
me="$(readlink -f "$0")"
here="${me%/*}"
me="${me##*/}"
exec "$here/pressure-vessel-unruntime" --runtime "${here}/../../scout/files" "$@"
# vim:set sw=4 sts=4 et:
......@@ -38,6 +38,7 @@ n=0
for shell_script in \
*.sh \
pressure-vessel-unruntime \
pressure-vessel-unruntime-scout \
pressure-vessel-unruntime-test-ui \
tests/*.sh \
; do
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment