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

Remove -unruntime-test-ui


We have a straightforward environment-variable-based way to select this.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 1b0adb04
No related branches found
No related tags found
No related merge requests found
...@@ -283,7 +283,7 @@ Instructions for testing ...@@ -283,7 +283,7 @@ Instructions for testing
- below LastPlayed, add: - below LastPlayed, add:
"LaunchOptions" "~/.steam/steam/steamapps/common/SteamLinuxRuntime/pressure-vessel/bin/pressure-vessel-unruntime-test-ui -- %command%" "LaunchOptions" "PRESSURE_VESSEL_WRAP_GUI=1 ~/.steam/steam/steamapps/common/SteamLinuxRuntime/pressure-vessel/bin/pressure-vessel-unruntime -- %command%"
- restart Steam (on SteamOS use `sudo systemctl restart lightdm`) - restart Steam (on SteamOS use `sudo systemctl restart lightdm`)
...@@ -474,7 +474,7 @@ configured. ...@@ -474,7 +474,7 @@ configured.
### More options ### More options
Use `pressure-vessel-unruntime` or `pressure-vessel-unruntime-test-ui` Use `pressure-vessel-unruntime`
if you are in a Steam Runtime environment (the Steam Runtime's `run.sh` if you are in a Steam Runtime environment (the Steam Runtime's `run.sh`
or a Steam game), and `pressure-vessel-wrap` or `pressure-vessel-test-ui` or a Steam game), and `pressure-vessel-wrap` or `pressure-vessel-test-ui`
if you are not ("Add non-Steam game" in Steam, or a non-Steam-related if you are not ("Add non-Steam game" in Steam, or a non-Steam-related
......
...@@ -105,7 +105,6 @@ SCRIPTS = [ ...@@ -105,7 +105,6 @@ SCRIPTS = [
'pressure-vessel-test-ui', 'pressure-vessel-test-ui',
'pressure-vessel-unruntime', 'pressure-vessel-unruntime',
'pressure-vessel-unruntime-scout', 'pressure-vessel-unruntime-scout',
'pressure-vessel-unruntime-test-ui',
] ]
EXECUTABLES = [ EXECUTABLES = [
'pressure-vessel-adverb', 'pressure-vessel-adverb',
......
...@@ -186,7 +186,6 @@ scripts = [ ...@@ -186,7 +186,6 @@ scripts = [
'pressure-vessel-test-ui', 'pressure-vessel-test-ui',
'pressure-vessel-unruntime', 'pressure-vessel-unruntime',
'pressure-vessel-unruntime-scout', 'pressure-vessel-unruntime-scout',
'pressure-vessel-unruntime-test-ui',
] ]
foreach script : scripts foreach script : scripts
......
#!/bin/bash
# pressure-vessel-unruntime — undo the Steam Runtime's environment
#
# Copyright © 2017-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##*/}"
export PRESSURE_VESSEL_WRAP_GUI=yes
exec "$here/pressure-vessel-unruntime" "$@"
# vim:set sw=4 sts=4 et:
...@@ -37,7 +37,6 @@ n=0 ...@@ -37,7 +37,6 @@ n=0
for shell_script in \ for shell_script in \
./pressure-vessel-unruntime \ ./pressure-vessel-unruntime \
./pressure-vessel-unruntime-scout \ ./pressure-vessel-unruntime-scout \
./pressure-vessel-unruntime-test-ui \
./pressure-vessel-locale-gen \ ./pressure-vessel-locale-gen \
./tests/*.sh \ ./tests/*.sh \
; do ; 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