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

scout-on-soldier: Always do setup in var/


This means that ${here}/steam-runtime can safely be a symlink to a copy
of scout in a read-only location.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent de13a9d4
No related branches found
No related tags found
1 merge request!55populate-depot: Fix and test layered runtime
...@@ -119,22 +119,23 @@ main () { ...@@ -119,22 +119,23 @@ main () {
fi fi
if [ -d "${here}/steam-runtime" ]; then if [ -d "${here}/steam-runtime" ]; then
runtime="${here}/steam-runtime" src="${here}/steam-runtime"
else else
# Note that this only works because setup.sh and run.sh do not take
# the $(realpath) of their $0.
runtime="${here}/var/steam-runtime"
mkdir -p "$runtime"
src="${STEAM_COMPAT_CLIENT_INSTALL_PATH:-"$HOME/.steam/root"}/ubuntu12_32/steam-runtime" src="${STEAM_COMPAT_CLIENT_INSTALL_PATH:-"$HOME/.steam/root"}/ubuntu12_32/steam-runtime"
ln -fns "$src/amd64" "$runtime/"
ln -fns "$src/i386" "$runtime/"
ln -fns "$src/lib" "$runtime/"
ln -fns "$src/run.sh" "$runtime/"
ln -fns "$src/setup.sh" "$runtime/"
ln -fns "$src/usr" "$runtime/"
fi fi
# Note that this only works because setup.sh and run.sh do not take
# the $(realpath) of their $0.
runtime="${here}/var/steam-runtime"
mkdir -p "$runtime"
ln -fns "$src/amd64" "$runtime/"
ln -fns "$src/i386" "$runtime/"
ln -fns "$src/lib" "$runtime/"
ln -fns "$src/run.sh" "$runtime/"
ln -fns "$src/setup.sh" "$runtime/"
ln -fns "$src/usr" "$runtime/"
[ -z "$verbose" ] || log "$runtime/setup.sh..." [ -z "$verbose" ] || log "$runtime/setup.sh..."
# Make sure pinning is up to date # Make sure pinning is up to date
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment