Free fork of NotProton: Windows Steam games in Mac Steam, on CodeWeavers' Wine and Apple's Game Porting Toolkit
Swift apple-silicond3dmetaldxmtdxvkgame-porting-toolkitgptkmac-gamingmacosmetalfxrosetta-2steamsteam-playwinewinecx
feat(run): bridgeplay paths, logs and BRIDGEPLAY_ settings in the run script
raymondchinse7f821a43660
diff --git a/dylib/feats/compat_run.sh b/dylib/feats/compat_run.shindex d342a86..fbcd675 100755--- a/dylib/feats/compat_run.sh+++ b/dylib/feats/compat_run.sh@@ -1,5 +1,5 @@#!/bin/sh-# notproton CrossOver compatibility tool shim+# bridgeplay CrossOver compatibility tool shimset -everb="$1"@@ -10,6 +10,17 @@ shift || true# and anything after %command% is a launch argument passed to the game.launch_args="$*"+# Steam launch options and gamefix confs spell the settings BRIDGEPLAY_<X>; everything below+# reads NOTPROTON_<X>, the name upstream NotProton uses. NOTPROTON_<X> stays honored and wins+# when both are set, so launch options written before Bridgeplay 3.0 keep working.+for np_name in $(env | LC_ALL=C sed -n 's/^BRIDGEPLAY_\([A-Z0-9_]*\)=.*/\1/p'); do+ eval "np_new=\${BRIDGEPLAY_$np_name+x} np_old=\${NOTPROTON_$np_name+x}"+ # shellcheck disable=SC2154 # eval assigns np_new and np_old on the line above+ if [ -n "$np_new" ] && [ -z "$np_old" ]; then+ eval "export NOTPROTON_$np_name=\"\$BRIDGEPLAY_$np_name\""+ fi+done+case "$verb" ingetcompatpath)printf '%s\n' "$STEAM_COMPAT_DATA_PATH"@@ -17,7 +28,11 @@ case "$verb" in;;esac-np_support="$HOME/Library/Application Support/notproton"+np_support="$HOME/Library/Application Support/bridgeplay"+# Before the app moves the support folder over, a game still runs from the old one.+if [ ! -d "$np_support" ] && [ -d "$HOME/Library/Application Support/notproton" ]; then+ np_support="$HOME/Library/Application Support/notproton"+ficontroller_bridge="$np_support/controllers/dualsense/launch"if [ "$verb" = waitforexitandrun ] && [ "${DSB_SESSION:-0}" != 1 ] && [ -x "$controller_bridge" ]; thenexec "$controller_bridge" "$0" "$verb" "$@"@@ -119,13 +134,13 @@ resolve_icon() {fiicon_cache="$icon_root/game.icns"icon_status=1- if [ -n "$art" ] && [ -s "$icon_cache" ] && [ "$(cat "$icon_root/notproton-icon.source" 2>/dev/null)" = "$icon_source" ]; then+ if [ -n "$art" ] && [ -s "$icon_cache" ] && [ "$(cat "$icon_root/bridgeplay-icon.source" 2>/dev/null)" = "$icon_source" ]; thenicon_status=0echo "icon reused from $art" >> "$log" 2>&1 || trueelif [ -n "$art" ] && [ -x "$iconmaker" ]; thenif "$iconmaker" "$art" "$icon_cache" >> "$log" 2>&1; thenicon_status=0- printf '%s\n' "$icon_source" > "$icon_root/notproton-icon.source"+ printf '%s\n' "$icon_source" > "$icon_root/bridgeplay-icon.source"echo "icon built from $art" >> "$log" 2>&1 || trueelif [ "$art" = "$ico" ]; then# A cached .ico that iconmaker rejects is corrupt and passes the size@@ -225,14 +240,14 @@ export WINEDLLPATH="$CX_ROOT/lib/wine/x86_64-windows:$wine_unix${WINEDLLPATH:+:$export PATH="$CX_ROOT/bin:$PATH"if [ -n "$STEAM_COMPAT_DATA_PATH" ]; then- log="$STEAM_COMPAT_DATA_PATH/notproton-run.log"+ log="$STEAM_COMPAT_DATA_PATH/bridgeplay-run.log"elselog=/dev/nullfi[ "$(stat -f %z "$log" 2>/dev/null || echo 0)" -gt 262144 ] \&& : > "$log" || true{- echo "=== notproton run $(date) ==="+ echo "=== bridgeplay run $(date) ==="echo "verb=$verb"echo "args:"; for a in "$@"; do printf ' [%s]\n' "$a"; doneecho "cwd=$(pwd)"@@ -308,7 +323,7 @@ echo "app_id=$app_id (STEAM_COMPAT_APP_ID=$STEAM_COMPAT_APP_ID)" >> "$log" 2>&1# winebus through the environment; its registry "map" loader crashes in this Wine.# macOS Steam has no virtual gamepad Wine could read, so a pad Steam Input claims (and# lists in SDL_GAMECONTROLLER_IGNORE_DEVICES) would reach the game as nothing. Games read-# pads directly unless the launch options set NOTPROTON_RAW_CONTROLLERS=0.+# pads directly unless the launch options set BRIDGEPLAY_RAW_CONTROLLERS=0.if [ "${NOTPROTON_RAW_CONTROLLERS:-1}" = "1" ]; thenNOTPROTON_RAW_CONTROLLERS=1SDL_GAMECONTROLLER_IGNORE_DEVICES=@@ -458,6 +473,11 @@ gamefix_read() {gamefix_log "$2 conf line $lineno rejected: not KEY=VALUE"continuefi+ # The keys that set a BRIDGEPLAY_ variable also take its full name: BRIDGEPLAY_RETINA=1 is RETINA=1.+ case "$key" in+ BRIDGEPLAY_STDOUT_NULL|BRIDGEPLAY_VSYNC|BRIDGEPLAY_RETINA|BRIDGEPLAY_FRAMEGEN|BRIDGEPLAY_FRAMEGEN_?*)+ key=${key#BRIDGEPLAY_} ;;+ esacvalue=${line#*=}reason=$(gamefix_reason "$key" "$value")if [ -n "$reason" ]; then@@ -678,7 +698,7 @@ imports_d3d12() {return 1}-# NOTPROTON_BACKEND > CX_GRAPHICS_BACKEND > gamefix BACKEND > auto-detect > dxmt, then down+# BRIDGEPLAY_BACKEND > CX_GRAPHICS_BACKEND > gamefix BACKEND > auto-detect > dxmt, then down# to what the engine has.select_backend() {wanted=""@@ -695,8 +715,8 @@ select_backend() {'') ;;dxmt|dxvk|wined3d|d3dmetal)wanted=$NOTPROTON_BACKEND- backend_from="NOTPROTON_BACKEND in the launch options" ;;- *) graphics_log "NOTPROTON_BACKEND is not dxmt, dxvk, wined3d or d3dmetal, ignored" ;;+ backend_from="BRIDGEPLAY_BACKEND in the launch options" ;;+ *) graphics_log "BRIDGEPLAY_BACKEND is not dxmt, dxvk, wined3d or d3dmetal, ignored" ;;esac# The Steam panel's Graphics menu writes CX_GRAPHICS_BACKEND.if [ -z "$wanted" ] && [ -n "${CX_GRAPHICS_BACKEND:-}" ]; then@@ -1282,7 +1302,7 @@ $controllers_wanted"}# Sets Wine's DisableHidraw for games with "Disable hidraw" checked. When it's-# unchecked, the value is removed only if NotProton set it.+# unchecked, the value is removed only if Bridgeplay set it.plan_disable_hidraw() {hidraw_file="$STEAM_COMPAT_DATA_PATH/notproton-disable-hidraw"hidraw_value=""@@ -1401,7 +1421,7 @@ import_prefix_settings() {without_lock_fds "$WINESERVER" -w >> "$log" 2>&1 || truefiif [ "$import_status" -eq 0 ] && [ "$hidraw_planned" -eq 1 ] && [ "$NOTPROTON_DISABLE_HIDRAW" = "1" ]; then- echo "controllers: hidraw disabled (NOTPROTON_DISABLE_HIDRAW=1)" >> "$log" 2>&1 || true+ echo "controllers: hidraw disabled (BRIDGEPLAY_DISABLE_HIDRAW=1)" >> "$log" 2>&1 || truefiif [ "$import_status" -eq 0 ] && [ -n "$dpi_value" ]; thenecho "video: LogPixels=$new_dpi" >> "$log" 2>&1 || true@@ -1409,7 +1429,7 @@ import_prefix_settings() {if [ "$import_status" -eq 0 ] && [ "$controllers_planned" -eq 1 ]; thenwrite_owned_controllers "$controllers_wanted" 2>/dev/null || trueif [ "$NOTPROTON_RAW_CONTROLLERS" = "1" ]; then- echo "controllers: games read them directly (NOTPROTON_RAW_CONTROLLERS=1)" >> "$log" 2>&1 || true+ echo "controllers: games read them directly (BRIDGEPLAY_RAW_CONTROLLERS=1)" >> "$log" 2>&1 || trueelif [ -n "$controllers_wanted" ]; thenecho "controllers: $(printf '%s\n' "$controllers_wanted" | grep -c .) kept off hidraw" \>> "$log" 2>&1 || true@@ -1723,7 +1743,7 @@ prepare_prefix_directory() {for interrupted in "$STEAM_COMPAT_DATA_PATH"/pfx.replaced.*; do[ -e "$interrupted" ] || [ -L "$interrupted" ] || continueecho "=== interrupted prefix replacement needs recovery: $interrupted ===" >> "$log" 2>&1 || true- show_alert "Prefix recovery required" "An interrupted prefix replacement may hold saved games. Do not delete this prefix. Check its notproton-run.log for the recovery folder."+ show_alert "Prefix recovery required" "An interrupted prefix replacement may hold saved games. Do not delete this prefix. Check its bridgeplay-run.log for the recovery folder."exit 1donemkdir -p "$WINEPREFIX"@@ -1866,7 +1886,7 @@ if [ -n "$STEAM_COMPAT_DATA_PATH" ]; thenseed_prefix_from_templatestage_step="profile layout"if ! lay_out_proton_profile; then- show_alert "Saved-game folders need attention" "Bridgeplay left the conflicting files in place. Open this prefix's notproton-run.log for details before trying again."+ show_alert "Saved-game folders need attention" "Bridgeplay left the conflicting files in place. Open this prefix's bridgeplay-run.log for details before trying again."exit 1fi[ "$verb" != waitforexitandrun ] || echo "video: RetinaMode=${NOTPROTON_RETINA:-0}" >> "$log" 2>&1 || true@@ -2060,7 +2080,7 @@ if [ -d "$bridge_src" ] && [ -n "$WINEPREFIX" ]; thenfidoneif [ "$unstaged" -eq 1 ]; then- show_alert "Steam files could not be copied" "Bridgeplay could not copy a file into this game's prefix. Open this prefix's notproton-run.log for details."+ show_alert "Steam files could not be copied" "Bridgeplay could not copy a file into this game's prefix. Open this prefix's bridgeplay-run.log for details."exit 1fifi@@ -2073,7 +2093,7 @@ if [ -d "$bridge_src" ] && [ -n "$WINEPREFIX" ]; thendoneverify_runnerif ! install_lsteamclient_trigger; then- show_alert "Steam files could not be copied" "Bridgeplay could not copy a file into this game's prefix. Open this prefix's notproton-run.log for details."+ show_alert "Steam files could not be copied" "Bridgeplay could not copy a file into this game's prefix. Open this prefix's bridgeplay-run.log for details."exit 1fiinstall_legacy_steam_dll@@ -2145,7 +2165,7 @@ bundle_name=$(printf '%s' "$game_name" | tr -d '/:"`$\\')bundle_name=${bundle_name#"${bundle_name%%[!.]*}"}[ -n "$bundle_name" ] || bundle_name="Steam Game"game_name_xml=$(printf '%s' "$game_name" | sed -e 's/&/\&/g' -e 's/</\</g' -e 's/>/\>/g')-loader_root="$HOME/Library/Application Support/notproton/launchers/$app_id"+loader_root="$np_support/launchers/$app_id"mkdir -p "$loader_root"loader_app="$loader_root/$bundle_name.app"find "$loader_root" -maxdepth 1 -name '.build.*' -mmin +60 -exec rm -rf {} + 2>/dev/null || true@@ -2166,7 +2186,7 @@ fiuielement_arg=""if [ "${NOTPROTON_HIDE_LAUNCHER_TILE:-0}" = "1" ]; thenuielement_arg=" <key>LSUIElement</key><true/>"- echo "launcher tile hidden by NOTPROTON_HIDE_LAUNCHER_TILE" >> "$log" 2>&1 || true+ echo "launcher tile hidden by BRIDGEPLAY_HIDE_LAUNCHER_TILE" >> "$log" 2>&1 || trueficat > "$loader_contents/Info.plist" <<PLIST<?xml version="1.0" encoding="UTF-8"?>@@ -2218,9 +2238,9 @@ ficat > "$loader_macos/launcher" <<LAUNCHER#!/bin/shexport WINELOADER="$WINELOADER"-wine_log="$loader_root/notproton-wine.log"+wine_log="$loader_root/bridgeplay-wine.log"exec > "\$wine_log" 2>&1-shim="$HOME/Library/Application Support/notproton/overlay-shim.dylib"+shim="$np_support/overlay-shim.dylib"if [ -n "\$STEAM_DYLD_INSERT_LIBRARIES" ]; thenif [ -f "\$shim" ]; thenexport DYLD_INSERT_LIBRARIES="\$shim:\$STEAM_DYLD_INSERT_LIBRARIES"diff --git a/dylib/tests/buildcheck.sh b/dylib/tests/buildcheck.shindex c9cf614..eda9b0c 100644--- a/dylib/tests/buildcheck.sh+++ b/dylib/tests/buildcheck.sh@@ -25,7 +25,7 @@ clone() {}clone 26.3.0.39832 202607151200clone 27.0.0.40921-fex 202608211200-printf 'notproton\t27.0.0.40921-fex\tfex\tCrossOver Preview (FEX)\nnotproton-26.3\t26.3.0.39832\trosetta\tCrossOver 26.3\n' \+printf 'bridgeplay-proton\t27.0.0.40921-fex\tfex\tCrossOver Preview (FEX)\nbridgeplay-proton-26.3\t26.3.0.39832\trosetta\tCrossOver 26.3\n' \> "$np_support/tools"mtime() { stat -f %m "$np_support/runners/crossover-$1/CrossOver/share/wine/wine.inf"; }diff --git a/dylib/tests/envcheck.sh b/dylib/tests/envcheck.shindex 088cba3..28b52eb 100755--- a/dylib/tests/envcheck.sh+++ b/dylib/tests/envcheck.sh@@ -64,7 +64,7 @@ rm -rf "$vc_work"echo "== Apple GPTK initialization and launcher environment =="work=$(mktemp -d)trap 'rm -rf "$work"' EXIT-np_support="$work/Application Support/notproton"+np_support="$work/Application Support/bridgeplay"np_build="test"library="$np_support/runners/crossover-$np_build/CrossOver/lib64/apple_gptk/external/libd3dshared.dylib"init=$(sed -n '/^CX_ROOT=/,/^wine_unix=/p' "$SRC")@@ -169,6 +169,31 @@ doneis "FEX settings reach the game" "FEX_MULTIBLOCK=0 FEX_X87REDUCEDPRECISION=0 " "$(printf %s "$fex_args" | sort | tr '\n' ' ')"unset -v FEX_X87REDUCEDPRECISION FEX_MULTIBLOCK+echo "== the support folder and the BRIDGEPLAY_ names =="+# shellcheck disable=SC2016 # Match the literal assignment.+pick=$(sed -n '/^np_support="\$HOME\/Library\/Application Support\/bridgeplay"$/,/^fi$/p' "$SRC")+# shellcheck disable=SC2016 # Match the literal loop.+names=$(sed -n '/^for np_name in \$(env /,/^done$/p' "$SRC")+[ -n "$pick" ] && [ -n "$names" ] || { echo "FAIL: the support folder or name blocks not found"; exit 1; }+support_for() {+ # shellcheck disable=SC2030 # HOME changes in this subshell only+ (HOME="$work/home-$1"; mkdir -p "$HOME/Library/Application Support"+ for d in $2; do mkdir -p "$HOME/Library/Application Support/$d"; done+ eval "$pick"; printf '%s' "${np_support##*/}")+}+is "a migrated home uses bridgeplay" "bridgeplay" "$(support_for new bridgeplay)"+is "a home with only the old folder keeps using it" "notproton" "$(support_for old notproton)"+is "both present: bridgeplay wins" "bridgeplay" "$(support_for both 'bridgeplay notproton')"+is "a fresh home gets bridgeplay" "bridgeplay" "$(support_for none '')"+# shellcheck disable=SC2016 # the inner sh expands them+mapped() { env -i PATH="$PATH" "$@" names="$names" sh -ec 'eval "$names"; printf "%s|%s" "${NOTPROTON_RETINA-unset}" "${NOTPROTON_FRAMEGEN-unset}"'; }+is "BRIDGEPLAY_ names reach the NOTPROTON_ ones" "1|2" "$(mapped BRIDGEPLAY_RETINA=1 BRIDGEPLAY_FRAMEGEN=2)"+is "a NOTPROTON_ name already set wins" "0|unset" "$(mapped BRIDGEPLAY_RETINA=1 NOTPROTON_RETINA=0)"+is "an empty BRIDGEPLAY_ value is still a value" "|unset" "$(mapped BRIDGEPLAY_RETINA=)"+is "a value holding a quote and a newline is copied as is" "a'b+c|unset" "$(mapped "BRIDGEPLAY_RETINA=a'b+c")"+if [ "$fails" -eq 0 ]; thenecho "==> envcheck: all assertions hold"elsediff --git a/dylib/tests/gamefixescheck.sh b/dylib/tests/gamefixescheck.shindex f2e3b85..0a712e6 100644--- a/dylib/tests/gamefixescheck.sh+++ b/dylib/tests/gamefixescheck.sh@@ -14,6 +14,8 @@ for name in gamefix_log valid_dll_overrides gamefix_reason gamefix_read gamefix_functions="$functions$body"done+public_names=$(sed -n '/^for np_name in $(env /,/^done$/p' "$SRC")+[ -n "$public_names" ] || { echo "FAIL: the BRIDGEPLAY_ to NOTPROTON_ loop not found"; exit 1; }bridge_line=$(grep 'export WINEDLLOVERRIDES=' "$SRC" | grep 'lsteamclient=b' | sed 's/^[[:space:]]*//')[ -n "$bridge_line" ] || { echo "FAIL: the bridge WINEDLLOVERRIDES line not found"; exit 1; }forward=$(sed -n '/^for name in $(env /,/^done$/p' "$SRC")@@ -94,11 +96,12 @@ launch() {target=$2shift 2env -i PATH="$PATH" HOME="$HOME" "$@" \- functions="$functions" bridge_line="$bridge_line" \+ functions="$functions" bridge_line="$bridge_line" public_names="$public_names" \app_id=4242 verb="$verb" log="$case_dir/log" \np_support="$case_dir/support" CX_ROOT="$case_dir/engine" \STEAM_COMPAT_DATA_PATH="$case_dir/data" WINEPREFIX="$case_dir/data/pfx" \sh -ec '+ eval "$public_names"eval "$functions"gamefix_keys="" gamefix_backend="" gamefix_dlloverrides="" gamefix_msync="" gamefix_nvapi="" gamefix_dlss_fg="" gamefix_args=""backend_root="$CX_ROOT/lib/notproton-backends"@@ -220,8 +223,8 @@ is "the later file wins DLLOVERRIDES whole" \new_casefull_engineuser_conf 'BACKEND=dxvk' 'DLLOVERRIDES=dinput8=n,b;dxgi=n'-launch waitforexitandrun "$case_dir/game/game.exe" NOTPROTON_BACKEND=wined3d WINEDLLOVERRIDES='dinput8=b'-is "NOTPROTON_BACKEND beats the conf" "wined3d" "$(got backend)"+launch waitforexitandrun "$case_dir/game/game.exe" BRIDGEPLAY_BACKEND=wined3d WINEDLLOVERRIDES='dinput8=b'+is "BRIDGEPLAY_BACKEND beats the conf" "wined3d" "$(got backend)"is "overrides run backend, conf, launch options, then the Steam trio" \"d3d10core,d3d11,dxgi=b;dinput8=n,b;dxgi=n;dinput8=b;$trio" "$(got WINEDLLOVERRIDES)"new_case@@ -232,9 +235,9 @@ launch waitforexitandrun "$case_dir/game/game.exe"is "a conf BACKEND beats auto-detection" "dxvk" "$(got backend)"new_casefull_engine-launch waitforexitandrun "$case_dir/game/game.exe" NOTPROTON_BACKEND=metal-is "an invalid NOTPROTON_BACKEND falls through to auto" "dxmt" "$(got backend)"-has "and is logged" "NOTPROTON_BACKEND is not dxmt, dxvk, wined3d or d3dmetal, ignored" "$case_dir/log"+launch waitforexitandrun "$case_dir/game/game.exe" BRIDGEPLAY_BACKEND=metal+is "an invalid BRIDGEPLAY_BACKEND falls through to auto" "dxmt" "$(got backend)"+has "and is logged" "BRIDGEPLAY_BACKEND is not dxmt, dxvk, wined3d or d3dmetal, ignored" "$case_dir/log"echo "== auto-detect reads the import table"new_case@@ -530,8 +533,19 @@ full_engineuser_conf 'RETINA=1'launch waitforexitandrun "$case_dir/game/game.exe"is "RETINA maps to NOTPROTON_RETINA" "1" "$(got NOTPROTON_RETINA)"-launch waitforexitandrun "$case_dir/game/game.exe" NOTPROTON_RETINA=0+launch waitforexitandrun "$case_dir/game/game.exe" BRIDGEPLAY_RETINA=0is "the High Resolution launch option wins" "0" "$(got NOTPROTON_RETINA)"+launch waitforexitandrun "$case_dir/game/game.exe" NOTPROTON_RETINA=0+is "the pre-3.0 spelling still wins over the conf" "0" "$(got NOTPROTON_RETINA)"+launch waitforexitandrun "$case_dir/game/game.exe" NOTPROTON_RETINA=0 BRIDGEPLAY_RETINA=1+is "NOTPROTON_ wins when both spellings are set" "0" "$(got NOTPROTON_RETINA)"+new_case+full_engine+user_conf 'BRIDGEPLAY_RETINA=1' 'BRIDGEPLAY_FRAMEGEN=2' 'BRIDGEPLAY_BACKEND=dxvk'+launch waitforexitandrun "$case_dir/game/game.exe"+is "a conf key takes the BRIDGEPLAY_ name" "1" "$(got NOTPROTON_RETINA)"+is "and so does FRAMEGEN" "2" "$(got NOTPROTON_FRAMEGEN)"+has "BACKEND does not, it names no variable" "rejected BRIDGEPLAY_BACKEND: not on the allow-list" "$case_dir/log"echo "== FRAMEGEN"new_case@@ -570,11 +584,12 @@ is "no conf leaves the quality to the shim" "<unset>" "$(got NOTPROTON_FRAMEGEN_# The stub reports NOTPROTON_OVERLAY_SHIM, set beside DYLD_INSERT_LIBRARIES, since SIP strips DYLD_* from /bin/sh.echo "== the launcher loads the shim for frame generation unless it is off"-mkdir -p "$work/launcher/Contents/MacOS" "$work/launcher/home/Library/Application Support/notproton"-: > "$work/launcher/home/Library/Application Support/notproton/overlay-shim.dylib"+mkdir -p "$work/launcher/Contents/MacOS" "$work/launcher/home/Library/Application Support/bridgeplay"+: > "$work/launcher/home/Library/Application Support/bridgeplay/overlay-shim.dylib"printf '#!/bin/sh\nprintf "%%s" "${NOTPROTON_OVERLAY_SHIM:-none}"\n' > "$work/launcher/wine"chmod +x "$work/launcher/wine"env -i PATH="$PATH" HOME="$work/launcher/home" WINELOADER="$work/launcher/wine" loader_root="$work/launcher" \+ np_support="$work/launcher/home/Library/Application Support/bridgeplay" \loader_macos="$work/launcher/Contents/MacOS" body="$launcher_body" sh -ec 'eval "$body"'chmod +x "$work/launcher/Contents/MacOS/launcher"for spec in '-:none' '0:none' 'off:none' '1:shim' '2:shim' '3:shim' 'adaptive:shim'; do@@ -584,7 +599,7 @@ for spec in '-:none' '0:none' 'off:none' '1:shim' '2:shim' '3:shim' 'adaptive:shelseenv -i PATH="$PATH" NOTPROTON_FRAMEGEN="$fg" "$work/launcher/Contents/MacOS/launcher" >/dev/null 2>&1 || truefi- got_dyld=$(cat "$work/launcher/notproton-wine.log")+ got_dyld=$(cat "$work/launcher/bridgeplay-wine.log")case "$got_dyld" in *overlay-shim.dylib) got_dyld=shim ;; esacis "NOTPROTON_FRAMEGEN=${fg#-} without the Steam overlay: $want" "$want" "$got_dyld"donediff --git a/dylib/tests/settingscheck.sh b/dylib/tests/settingscheck.shindex 6d9dc61..7b5328e 100644--- a/dylib/tests/settingscheck.sh+++ b/dylib/tests/settingscheck.sh@@ -159,7 +159,7 @@ again "" 0{ cat "$work/retina-off"; shown 054c/0ce6; shown 057e/2006; shown 057e/2007; shown 057e/2009; } > "$work/expected"same_file "NOTPROTON_RAW_CONTROLLERS=1 removes every key Bridgeplay wrote" "$work/expected" "$case_dir/imported"is "NOTPROTON_RAW_CONTROLLERS=1 tracks nothing" "" "$(owned)"-is "NOTPROTON_RAW_CONTROLLERS=1 is logged" "controllers: games read them directly (NOTPROTON_RAW_CONTROLLERS=1)" "$(cat "$case_dir/log")"+is "NOTPROTON_RAW_CONTROLLERS=1 is logged" "controllers: games read them directly (BRIDGEPLAY_RAW_CONTROLLERS=1)" "$(cat "$case_dir/log")"new_casein_registry 28de/1304 057e/2009diff --git a/dylib/tests/shortcut-launch.py b/dylib/tests/shortcut-launch.pyindex 0e64549..909f4a8 100644--- a/dylib/tests/shortcut-launch.py+++ b/dylib/tests/shortcut-launch.py@@ -18,7 +18,7 @@ with tempfile.TemporaryDirectory(prefix="np-shortcut-icons-") as temporary:desktop_icon = root / "Desktop/Game.app/Contents/Resources/shortcut.icns"desktop_icon.write_bytes(b"user icon")- support = root / "Library/Application Support/notproton"+ support = root / "Library/Application Support/bridgeplay"support.mkdir(parents=True)(support / "appinfo").write_text("#!/bin/sh\nprintf 'name=Game\\nicon=abc123\\n'\n")(support / "iconmaker").write_text(diff --git a/gamefixes/README b/gamefixes/READMEindex 2bb9314..61c8761 100644--- a/gamefixes/README+++ b/gamefixes/README@@ -2,8 +2,8 @@ Per-game defaults shipped with Bridgeplay.One file per game, named <steam appid>.conf (for example 1245620.conf), in KEY=VALUE form.`make app-payload` bundles every *.conf here into the app, and the installer copies them-to ~/Library/Application Support/notproton/gamefixes-default/, replacing that directory's-contents each time. Overrides belong in ~/Library/Application Support/notproton/gamefixes/,+to ~/Library/Application Support/bridgeplay/gamefixes-default/, replacing that directory's+contents each time. Overrides belong in ~/Library/Application Support/bridgeplay/gamefixes/,which Bridgeplay never touches.Example 1245620.conf: