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

scout-on-soldier: Reset STEAM_ZENITY instead of unsetting, if available


Recent builds of soldier have zenity installed. This lets us show the
same progress dialog we would show normally, but from within the
container.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 516934c0
Branches
Tags
1 merge request!55populate-depot: Fix and test layered runtime
...@@ -110,8 +110,13 @@ main () { ...@@ -110,8 +110,13 @@ main () {
[ -z "$verbose" ] || log "Command to run: $(printf '%q ' "$@")" [ -z "$verbose" ] || log "Command to run: $(printf '%q ' "$@")"
# Just because zenity was available on the host system doesn't mean # Just because zenity was available on the host system doesn't mean
# it's available in this container (soldier doesn't currently have it) # it's available in this container. soldier historically didn't have it,
unset STEAM_ZENITY # but it was added in 0.20210618.0.
if [ -x /usr/bin/zenity ]; then
export STEAM_ZENITY=/usr/bin/zenity
else
unset STEAM_ZENITY
fi
if [ -d "${here}/steam-runtime" ]; then if [ -d "${here}/steam-runtime" ]; then
runtime="${here}/steam-runtime" runtime="${here}/steam-runtime"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment