at master 2.7 kB view raw
1diff --git a/src/protontricks/data/scripts/bwrap_launcher.sh b/src/protontricks/data/scripts/bwrap_launcher.sh 2index 922c59d..54742a4 100644 3--- a/src/protontricks/data/scripts/bwrap_launcher.sh 4+++ b/src/protontricks/data/scripts/bwrap_launcher.sh 5@@ -1,4 +1,4 @@ 6-#!/bin/bash 7+#!@bash@ 8 # Helper script 9 set -o errexit 10 11diff --git a/src/protontricks/data/scripts/wine_launch.sh b/src/protontricks/data/scripts/wine_launch.sh 12index 1b0a0ce..127f13e 100644 13--- a/src/protontricks/data/scripts/wine_launch.sh 14+++ b/src/protontricks/data/scripts/wine_launch.sh 15@@ -1,4 +1,4 @@ 16-#!/bin/bash 17+#!@bash@ 18 # Helper script created by Protontricks to run Wine binaries using Steam Runtime 19 set -o errexit 20 21diff --git a/src/protontricks/data/scripts/wineserver_keepalive.sh b/src/protontricks/data/scripts/wineserver_keepalive.sh 22index 8168dae..cb3e7d9 100644 23--- a/src/protontricks/data/scripts/wineserver_keepalive.sh 24+++ b/src/protontricks/data/scripts/wineserver_keepalive.sh 25@@ -1,4 +1,4 @@ 26-#!/bin/bash 27+#!@bash@ 28 # A simple keepalive script that will ensure a wineserver process is kept alive 29 # for the duration of the Protontricks session. 30 # This is accomplished by launching a simple Windows batch script that will 31diff --git a/src/protontricks/util.py b/src/protontricks/util.py 32index 0c7de98..afea7e4 100644 33--- a/src/protontricks/util.py 34+++ b/src/protontricks/util.py 35@@ -99,7 +99,7 @@ def get_host_library_paths(): 36 # Since that command is unavailable with newer Steam Runtime releases, 37 # do it ourselves here. 38 result = run( 39- ["/sbin/ldconfig", "-XNv"], 40+ ["@steamRun@", "/sbin/ldconfig", "-XNv"], 41 check=True, stdout=PIPE, stderr=PIPE 42 ) 43 lines = result.stdout.decode("utf-8").split("\n") 44diff --git a/tests/conftest.py b/tests/conftest.py 45index fdb44ed..4758799 100644 46--- a/tests/conftest.py 47+++ b/tests/conftest.py 48@@ -175,7 +175,7 @@ def steam_runtime_dir(steam_dir): 49 """ 50 (steam_dir.parent / "root" / "ubuntu12_32" / "steam-runtime").mkdir(parents=True) 51 (steam_dir.parent / "root" / "ubuntu12_32" / "steam-runtime" / "run.sh").write_text( 52- "#!/bin/bash\n" 53+ "#!/bin/sh\n" 54 """if [ "$1" = "--print-steam-runtime-library-paths" ]; then\n""" 55 " echo 'fake_steam_runtime/lib:fake_steam_runtime/lib64'\n" 56 "fi" 57@@ -768,7 +768,7 @@ def xdg_user_dir_bin(home_dir): 58 # Only mock PICTURES and DOWNLOAD; mocking everything isn't necessary 59 # for the tests. 60 (home_dir / ".local" / "bin" / "xdg-user-dir").write_text( 61- '#!/bin/bash\n' 62+ '#!/bin/sh\n' 63 'if [[ "$1" == "PICTURES" ]]; then\n' 64 ' echo "$HOME/Pictures"\n' 65 'elif [[ "$1" == "DOWNLOAD" ]]; then\n'