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

Merge branch 'wip/smcv/cleanup-after-stable' into 'master'

Remove fallback for SLR_soldier not having s-r-launcher-interface-0

See merge request steamlinuxruntime!78
parents bca628e4 ab7bd265
No related branches found
No related tags found
No related merge requests found
......@@ -11,7 +11,6 @@ me="${me##*/}"
# Don't rely on it.
is_main=yes
launcher_service=
suite=
verbose=
log_to_file=
......@@ -278,15 +277,6 @@ for word in $ld_preload; do
done
IFS="$old_IFS"
# TODO: Remove this block and the launcher_service variable when
# s-r-l-i-0 is in the public stable Steam Runtime or the public stable
# SLR_soldier/pressure-vessel/bin
case "${STEAM_COMPAT_LAUNCHER_SERVICE-}" in
(container-runtime)
launcher_service=yes
;;
esac
if [ -x "$here/pressure-vessel/bin/steam-runtime-launcher-interface-0" ]; then
set -- \
"$here/pressure-vessel/bin/steam-runtime-launcher-interface-0" \
......@@ -297,31 +287,6 @@ elif command -v steam-runtime-launcher-interface-0 >/dev/null; then
steam-runtime-launcher-interface-0 \
container-runtime \
"$@"
# TODO: Remove this elif block when s-r-l-i-0 is in the public stable
# Steam Runtime or the public stable SLR_soldier/pressure-vessel/bin
elif [ -n "$launcher_service" ]; then
unset STEAM_COMPAT_LAUNCHER_SERVICE
appid="${STEAM_COMPAT_APP_ID-"${SteamAppId-0}"}"
launch_client="$here/pressure-vessel/bin/steam-runtime-launch-client"
launcher_service_address="--bus-name=com.steampowered.App${appid}"
container_args+=("--launcher")
# In this mode, arguments after "pressure-vessel-wrap --" go to
# s-r-launcher-service, and arguments after "s-r-launcher-service --"
# are in turn the actual command to run.
set -- "$launcher_service_address" --replace -- "$@"
echo "Starting program with command-launcher service." >&2
echo >&2
echo "To inject commands into the container, use a command like:" >&2
echo >&2
echo "$launch_client \\" >&2
echo " $launcher_service_address \\" >&2
# --directory='' means keep using the game's working directory
echo " --directory='' \\"
echo " -- \\"
echo " xterm"
echo >&2
fi
unset LD_LIBRARY_PATH
......
......@@ -39,18 +39,13 @@ usage () {
}
main () {
local appid="${STEAM_COMPAT_APP_ID-"${SteamAppId-0}"}"
local getopt_temp="help"
local launch_client
local launcher_service=
local launcher_service_address
local ours
local runtime
local src
local theirs
local theirs_should_be
local verbose=
local -a launcher_args=()
if [ "${STEAM_LINUX_RUNTIME_VERBOSE-}" = 1 ]; then
verbose=yes
......@@ -102,14 +97,6 @@ main () {
esac
done
# TODO: Remove this block and the launcher_service* variables when
# s-r-l-i-0 is in the public stable SLR_soldier container
case "${STEAM_COMPAT_LAUNCHER_SERVICE-}" in
(scout-in-container | scout-on-soldier)
launcher_service=yes
;;
esac
if [ "$#" -eq 0 ] || [ "$1" = -- ]; then
log "Error: A command to run is required"
usage 125
......@@ -260,42 +247,6 @@ main () {
steam-runtime-launcher-interface-0 \
scout-in-container:scout-on-soldier \
"$@"
# TODO: Remove this block and the launcher_service* variables when
# s-r-l-i-0 is in the public stable SLR_soldier container
elif [ -n "$launcher_service" ]; then
unset STEAM_COMPAT_LAUNCHER_SERVICE
launcher_service_address="--bus-name=com.steampowered.App${appid}"
launcher_args+=("$launcher_service_address")
launcher_args+=("--replace")
# We find steam-runtime-launcher-service in PATH. soldier and
# sniper since 0.20220428.x have this available.
set -- steam-runtime-launcher-service "${launcher_args[@]}" -- "$@"
# TODO: Looking next to PRESSURE_VESSEL_RUNTIME_BASE is taking
# advantage of an implementation detail of how SLR is put together.
# Ideally we would use $runtime/amd64/bin/s-r-l-c unconditionally,
# but we can't rely on that until it's included in the GA Steam Client.
for launch_client in \
"$runtime/amd64/bin/steam-runtime-launch-client" \
"${PRESSURE_VESSEL_RUNTIME_BASE-}/pressure-vessel/bin/steam-runtime-launch-client" \
; do
if [ -x "$launch_client" ]; then
break
fi
done
echo "Starting program with command-launcher service." >&2
echo >&2
echo "To inject commands into the container, use a command like:" >&2
echo >&2
echo "$launch_client \\" >&2
echo " $launcher_service_address \\" >&2
# --directory='' means keep using the game's working directory
echo " --directory='' \\"
echo " -- \\"
echo " xterm"
echo >&2
fi
if [ -n "$saved_ld_preload" ]; then
......
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