Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
steam-runtime-tools
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
steamrt
steam-runtime-tools
Commits
0432d57a
Commit
0432d57a
authored
7 years ago
by
Simon McVittie
Browse files
Options
Downloads
Patches
Plain Diff
Cope with unset PATH, LD_PRELOAD, LD_LIBRARY_PATH
Signed-off-by:
Simon McVittie
<
smcv@collabora.com
>
parent
d670713f
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
pressure-vessel-wrap
+6
-5
6 additions, 5 deletions
pressure-vessel-wrap
with
6 additions
and
5 deletions
pressure-vessel-wrap
+
6
−
5
View file @
0432d57a
...
...
@@ -2,7 +2,7 @@
# pressure-vessel — use containers for Steam
#
# Copyright © 2017 Collabora Ltd.
# Copyright © 2017
-2018
Collabora Ltd.
#
# SPDX-License-Identifier: MIT
#
...
...
@@ -34,10 +34,10 @@ me="${me##*/}"
# Undo any weird environment before we start running external
# executables. We put it back before running the actual app/game.
caller_ld_preload
=
"
$LD_PRELOAD
"
caller_ld_preload
=
"
$
{
LD_PRELOAD
:-}
"
unset
LD_PRELOAD
caller_ld_library_path
=
"
$LD_LIBRARY_PATH
"
caller_ld_library_path
=
"
$
{
LD_LIBRARY_PATH
:-}
"
if
[
-n
"
$SYSTEM_LD_LIBRARY_PATH
"
]
;
then
export
LD_LIBRARY_PATH
=
"
$SYSTEM_LD_LIBRARY_PATH
"
...
...
@@ -45,12 +45,13 @@ else
unset
LD_LIBRARY_PATH
fi
caller_path
=
"
$PATH
"
caller_path
=
"
${
PATH
:-
"
${
default_path
}
"
}
"
default_path
=
"/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games"
if
[
-n
"
$SYSTEM_PATH
"
]
;
then
export
PATH
=
"
$SYSTEM_PATH
"
else
PATH
=
"/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games
"
export
PATH
=
"
$default_path
"
fi
# If bwrap isn't installed as a standalone binary on the PATH, see
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment