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

dialog: Prefer to look for dialog-ui in $STEAM_RUNTIME_SCOUT


Historically $STEAM_RUNTIME has been both an input to steam.sh
(switching to a different LDLP runtime for testing, or disabling it
altogether) and an output from steam.sh/run.sh (indicating that we are
now inside the LDLP runtime), and when used as an input it can be set
to either a boolean or an absolute path.

This is needlessly confusing, and we're trying to phase out at least
its role as a path input, replacing it with $STEAM_RUNTIME_SCOUT which
is already used by the "Steam Linux Runtime 1.0 (scout)" hybrid
container runtime.

steamrt/tasks#520

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 3dbde195
Branches
Tags
1 merge request!760adapt to new use of $STEAM_RUNTIME_SCOUT
......@@ -177,10 +177,11 @@ As a last resort, it will attempt to fall back to **zenity**(1),
# ENVIRONMENT
`STEAM_RUNTIME`
`STEAM_RUNTIME_SCOUT`, `STEAM_RUNTIME`
: If set to an absolute path to the `LD_LIBRARY_PATH`-based
Steam Runtime 1.0 (scout), that version will be used in preference
to the typical `~/.steam/root/ubuntu12_32/steam-runtime`.
`STEAM_RUNTIME_SCOUT` is preferred if both are set.
`STEAM_RUNTIME_DIALOG_UI`
: If set to a command, attempt to use it as a higher priority than
......
......@@ -116,7 +116,7 @@ xterm_fallback () {
}
detect_scout_ldlp () {
for dir in "${1-}" ~/.steam/root/ubuntu12_32/steam-runtime; do
for dir in "${STEAM_RUNTIME_SCOUT-}" "${1-}" ~/.steam/root/ubuntu12_32/steam-runtime; do
if [ -n "$dir" ] && [ -x "$dir/amd64/usr/bin/zenity" ]; then
echo "$dir"
return 0
......@@ -389,7 +389,7 @@ main () {
if [ -z "$is_slr" ] \
&& ldlp_runtime=$(detect_scout_ldlp "$ldlp_runtime") \
; then
debug "LDLP runtime detected"
debug "LDLP runtime detected at $ldlp_runtime"
for program in \
~/.steam/root/ubuntu12_64/steam-dialog-ui \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment