From abecb15994465889b020913b95027d2ee18db07f Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Wed, 19 Aug 2020 14:48:47 +0100
Subject: [PATCH] Remove -unruntime-test-ui

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

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 README.md                         |  4 ++--
 build-relocatable-install.py      |  1 -
 meson.build                       |  1 -
 pressure-vessel-unruntime-test-ui | 40 -------------------------------
 tests/shellcheck.sh               |  1 -
 5 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100755 pressure-vessel-unruntime-test-ui

diff --git a/README.md b/README.md
index 14670054f..cb96b9257 100644
--- a/README.md
+++ b/README.md
@@ -283,7 +283,7 @@ Instructions for testing
 
     - 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`)
 
@@ -474,7 +474,7 @@ configured.
 
 ### 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`
 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
diff --git a/build-relocatable-install.py b/build-relocatable-install.py
index 51be981e5..4a39f1ecd 100755
--- a/build-relocatable-install.py
+++ b/build-relocatable-install.py
@@ -105,7 +105,6 @@ SCRIPTS = [
     'pressure-vessel-test-ui',
     'pressure-vessel-unruntime',
     'pressure-vessel-unruntime-scout',
-    'pressure-vessel-unruntime-test-ui',
 ]
 EXECUTABLES = [
     'pressure-vessel-adverb',
diff --git a/meson.build b/meson.build
index 808a289f0..0747c9905 100644
--- a/meson.build
+++ b/meson.build
@@ -186,7 +186,6 @@ scripts = [
   'pressure-vessel-test-ui',
   'pressure-vessel-unruntime',
   'pressure-vessel-unruntime-scout',
-  'pressure-vessel-unruntime-test-ui',
 ]
 
 foreach script : scripts
diff --git a/pressure-vessel-unruntime-test-ui b/pressure-vessel-unruntime-test-ui
deleted file mode 100755
index 4458d2c16..000000000
--- a/pressure-vessel-unruntime-test-ui
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/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:
diff --git a/tests/shellcheck.sh b/tests/shellcheck.sh
index f952e5127..49a13c906 100755
--- a/tests/shellcheck.sh
+++ b/tests/shellcheck.sh
@@ -37,7 +37,6 @@ n=0
 for shell_script in \
         ./pressure-vessel-unruntime \
         ./pressure-vessel-unruntime-scout \
-        ./pressure-vessel-unruntime-test-ui \
         ./pressure-vessel-locale-gen \
         ./tests/*.sh \
         ; do
-- 
GitLab