From 70eec3cc32e326765f3a2dbe8f02ec53af9a4fd7 Mon Sep 17 00:00:00 2001 From: ovurrsl Date: Fri, 23 Oct 2026 01:32:15 +0300 Subject: [PATCH] fix: a half-built steamrt shim is removed, and its launcher accepts --directory DIR --- tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 | 2 +- .../linuxfs/overlay/usr/local/bin/droiddeck-steamrt-shim | 9 +++++++++ tools/tests/test_steamrt_shim.py | 8 +++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 index df9ec941b7..f6f11d1873 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 @@ -521,7 +521,7 @@ ln -sfn "$STEAM_X64/ubuntu12_64" "$X64_HOME/.steam/bin64" ln -sfn "$STEAM_X64/linux32" "$X64_HOME/.steam/sdk32" ln -sfn "$STEAM_X64/linux64" "$X64_HOME/.steam/sdk64" # Valve's Steam Runtime container needs user namespaces and a session-bus launcher; steamrt-shim stands in for both. -droiddeck-steamrt-shim "$STEAM_X64/steamrt64" "$X64_HOME/steamrt-shim" || true +droiddeck-steamrt-shim "$STEAM_X64/steamrt64" "$X64_HOME/steamrt-shim" || rm -rf "$X64_HOME/steamrt-shim" # Valve's platform libraries ship without soname links (pressure-vessel makes them); ldconfig adds them here. srt_libs=$X64_HOME/steamrt-libs rm -rf "$srt_libs" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamrt-shim b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamrt-shim index 96e851bc9b..feb4c5711f 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamrt-shim +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steamrt-shim @@ -15,6 +15,7 @@ if [ -z "$srt_real" ] || [ ! -d "$srt_real" ]; then exit 1 fi rm -rf "$shim" +trap 'rm -rf "$shim"' ERR mkdir -p "$shim/bin" for e in "$srt_real"/* "$srt_real"/.[!.]*; do [ -e "$e" ] || continue @@ -40,6 +41,14 @@ while [ $# -gt 0 ]; do --directory=*) cd "${1#--directory=}" || exit 127 ;; --env=*) export "${1#--env=}" ;; --unset-env=*) unset "${1#--unset-env=}" ;; + --directory|--env|--unset-env) + [ $# -ge 2 ] || exit 127 + case $1 in + --directory) cd "$2" || exit 127 ;; + --env) export "$2" ;; + --unset-env) unset "$2" ;; + esac + shift ;; esac shift done diff --git a/tools/tests/test_steamrt_shim.py b/tools/tests/test_steamrt_shim.py index 54f105eeb0..05f7345fe1 100644 --- a/tools/tests/test_steamrt_shim.py +++ b/tools/tests/test_steamrt_shim.py @@ -46,6 +46,12 @@ class SteamrtShimTest(unittest.TestCase): launched = self.sh(self.shim / 'bin/steam-runtime-launch-client', '--env=BL_SHIM_TEST=yes', f'--directory={self.root}', '--', 'sh', '-c', 'echo "$BL_SHIM_TEST $(basename "$PWD")"') self.assertEqual(f'yes {self.root.name}\n', launched.stdout) + launched = self.sh(self.shim / 'bin/steam-runtime-launch-client', '--env', 'BL_SHIM_TEST=split', + '--directory', self.root, '--', 'sh', '-c', 'echo "$BL_SHIM_TEST $(basename "$PWD")"') + self.assertEqual(f'split {self.root.name}\n', launched.stdout) + missing = self.sh(self.shim / 'bin/steam-runtime-launch-client', '--directory', self.root / 'missing', + '--', 'true') + self.assertEqual(127, missing.returncode) def test_a_client_without_a_container_gets_no_shim(self): self.shim.mkdir() @@ -82,7 +88,7 @@ class SteamrtShimTest(unittest.TestCase): self.assertLess(guard, SESSION.index('"${steam_client[@]}" "${_bl_ui[@]}"')) self.assertIn('-u STEAM_STEAMRT_RECURSION_GUARD', SESSION[:guard]) self.assertIn('export STEAM_STEAMRT_RECURSION_GUARD=1', X64) - self.assertIn('droiddeck-steamrt-shim "$STEAM_X64/steamrt64" "$X64_HOME/steamrt-shim"', X64) + self.assertIn('droiddeck-steamrt-shim "$STEAM_X64/steamrt64" "$X64_HOME/steamrt-shim" || rm -rf "$X64_HOME/steamrt-shim"', X64) class SessionChannelTest(unittest.TestCase):