Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • steamrt/steamlinuxruntime
1 result
Show changes
Commits on Source (6)
......@@ -15,6 +15,17 @@ log_to_file=
log_dir=${STEAM_LINUX_RUNTIME_LOG_DIR-"${PRESSURE_VESSEL_VARIABLE_DIR-"${here}/var"}"}
keep_logs=
use_timestamp=
ld_preload=
# Arguments for pressure-vessel-wrap
declare -a container_args=()
if [ -n "${LD_PRELOAD-}" ]; then
container_args+=("--env-if-host=LD_PRELOAD=$LD_PRELOAD")
ld_preload="$LD_PRELOAD"
fi
unset LD_PRELOAD
if [ "${STEAM_LINUX_RUNTIME_VERBOSE-}" = 1 ]; then
verbose=yes
......@@ -33,7 +44,7 @@ fi
log () {
if [ -n "$use_timestamp" ]; then
timestamp=$(LD_PRELOAD='' date +'%H:%M:%S.%6N')
timestamp=$(date +'%H:%M:%S.%6N')
printf '%s\n' "${timestamp}: ${me}[$$]: $*" >&2
else
printf '%s\n' "${me}[$$]: $*" >&2
......@@ -287,14 +298,18 @@ case "${STEAM_RUNTIME-}" in
;;
esac
old_IFS="$IFS"
IFS=":"
for word in $ld_preload; do
container_args+=("--ld-preload=$word")
done
IFS="$old_IFS"
unset LD_LIBRARY_PATH
unset STEAM_RUNTIME
pressure_vessel="${PRESSURE_VESSEL_PREFIX:-"${here}/pressure-vessel"}"
# Arguments for pressure-vessel-wrap, currently none
declare -a container_args=()
if [ -z "${suite}" ]; then
run=run
else
......@@ -387,7 +402,6 @@ fi
--lock-file "${rendezvous}/.ref" \
-- \
env \
-u LD_PRELOAD \
-u FONTCONFIG_PATH \
-u SteamLauncherUI \
-u SteamAppId \
......@@ -432,7 +446,6 @@ if [ -n "$is_main" ]; then
else
launch_args=( \
${launch_args[0]+"${launch_args[@]}"} \
--unset-env LD_PRELOAD \
)
fi
......
......@@ -123,7 +123,7 @@ class TestPressureVessel(unittest.TestCase):
if os.access(ldlp, os.W_OK):
self.ld_library_path_runtime = ldlp = os.path.abspath(ldlp)
else:
old = self.ld_library_path_runtime
old = ldlp
ldlp = os.path.join(self.tmpdir.name, 'ldlp')
shutil.copytree(old, ldlp, symlinks=True)
self.ld_library_path_runtime = ldlp
......@@ -136,10 +136,7 @@ class TestPressureVessel(unittest.TestCase):
old = self.scout_layered
new = os.path.join(self.tmpdir.name, 'scout-on-soldier')
shutil.copytree(old, new, symlinks=True)
os.symlink(
self.ld_library_path_runtime,
os.path.join(new, 'steam-runtime'),
)
os.symlink(ldlp, os.path.join(new, 'steam-runtime'))
self.scout_layered = new
else:
self.scout_layered = ''
......
......@@ -19,10 +19,6 @@ if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
)
fi
if [ -z "${PRESSURE_VESSEL_DOWNLOAD_URL-}" ]; then
PRESSURE_VESSEL_DOWNLOAD_URL=https://repo.steampowered.com/pressure-vessel/snapshots/
fi
if [ -n "${IMAGES_DOWNLOAD_URL-}" ] && [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
populate_depot_args=( \
"${populate_depot_args[@]}" \
......@@ -41,21 +37,18 @@ else
)
fi
if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
pressure_vessel_args=( \
--pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
--pressure-vessel-version=latest \
)
elif [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESSURE_VESSEL_SSH_PATH-}" ]; then
pressure_vessel_args=()
if [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESSURE_VESSEL_SSH_PATH-}" ]; then
pressure_vessel_args=( \
"${pressure_vessel_args[@]}" \
--pressure-vessel-ssh-host="${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST}"}" \
--pressure-vessel-ssh-path="${PRESSURE_VESSEL_SSH_PATH}" \
--pressure-vessel-version=latest \
)
else
elif [ -n "${PRESSURE_VESSEL_DOWNLOAD_URL-}" ]; then
pressure_vessel_args=( \
"${pressure_vessel_args[@]}" \
--pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
--pressure-vessel-version=latest \
)
fi
......
......@@ -19,10 +19,6 @@ if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
)
fi
if [ -z "${PRESSURE_VESSEL_DOWNLOAD_URL-}" ]; then
PRESSURE_VESSEL_DOWNLOAD_URL=https://repo.steampowered.com/pressure-vessel/snapshots/
fi
if [ -n "${IMAGES_DOWNLOAD_URL-}" ] && [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
populate_depot_args=( \
"${populate_depot_args[@]}" \
......@@ -47,21 +43,18 @@ else
)
fi
if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
pressure_vessel_args=( \
--pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
--pressure-vessel-version=latest \
)
elif [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESSURE_VESSEL_SSH_PATH-}" ]; then
pressure_vessel_args=()
if [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESSURE_VESSEL_SSH_PATH-}" ]; then
pressure_vessel_args=( \
"${pressure_vessel_args[@]}" \
--pressure-vessel-ssh-host="${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST}"}" \
--pressure-vessel-ssh-path="${PRESSURE_VESSEL_SSH_PATH}" \
--pressure-vessel-version=latest \
)
else
elif [ -n "${PRESSURE_VESSEL_DOWNLOAD_URL-}" ]; then
pressure_vessel_args=( \
"${pressure_vessel_args[@]}" \
--pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
--pressure-vessel-version=latest \
)
fi
......
......@@ -19,10 +19,6 @@ if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
)
fi
if [ -z "${PRESSURE_VESSEL_DOWNLOAD_URL-}" ]; then
PRESSURE_VESSEL_DOWNLOAD_URL=https://repo.steampowered.com/pressure-vessel/snapshots/
fi
if [ -n "${IMAGES_DOWNLOAD_URL-}" ] && [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
populate_depot_args=( \
"${populate_depot_args[@]}" \
......@@ -41,21 +37,18 @@ else
)
fi
if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
pressure_vessel_args=( \
--pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
--pressure-vessel-version=latest \
)
elif [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESSURE_VESSEL_SSH_PATH-}" ]; then
pressure_vessel_args=()
if [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESSURE_VESSEL_SSH_PATH-}" ]; then
pressure_vessel_args=( \
"${pressure_vessel_args[@]}" \
--pressure-vessel-ssh-host="${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST}"}" \
--pressure-vessel-ssh-path="${PRESSURE_VESSEL_SSH_PATH}" \
--pressure-vessel-version=latest \
)
else
elif [ -n "${PRESSURE_VESSEL_DOWNLOAD_URL-}" ]; then
pressure_vessel_args=( \
"${pressure_vessel_args[@]}" \
--pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
--pressure-vessel-version=latest \
)
fi
......