Webstar/LibrePortal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Webstar:a7d819799f09e5c2958869c6531c6d0a8856df56
Branches Tags
Webstar:main
Webstar:claude/2
Webstar:v0.1.0
..
compare: Webstar:6b44e8efc42e44c0dfcee2aa142ad7f019ab0818
Branches Tags
Webstar:main
Webstar:claude/2
Webstar:v0.1.0

No commits in common. "a7d819799f09e5c2958869c6531c6d0a8856df56" and "6b44e8efc42e44c0dfcee2aa142ad7f019ab0818" have entirely different histories.
a7d819799f ... 6b44e8efc4

1 changed files with 4 additions and 9 deletions
Show Stats Expand all files Collapse all files

13
scripts/docker/command/docker_run_install.sh
View File

@ -39,27 +39,22 @@ dockerCommandRunInstallUser()
"PATH=/home/$CFG_DOCKER_INSTALL_USER/bin:/usr/bin:/bin:/usr/local/bin" "PATH=/home/$CFG_DOCKER_INSTALL_USER/bin:/usr/bin:/bin:/usr/local/bin"
) )
# Run from the install user's HOME, not the caller's cwd. At install time the
# caller is root in /root, which the unprivileged user can't enter, so
# cwd-sensitive tools error (e.g. find: "Failed to change directory: /root").
local run_cwd="/home/$CFG_DOCKER_INSTALL_USER"
# --argv: exec the remaining args verbatim (no shell re-parse) so regex/ # --argv: exec the remaining args verbatim (no shell re-parse) so regex/
# quotes/backslashes in arguments (e.g. sed scripts) survive intact. Default: # quotes/backslashes in arguments (e.g. sed scripts) survive intact. Default:
# treat $1 as a shell snippet via bash -c (needed for pipes/redirects/ # treat $1 as a shell snippet via bash -c (needed for pipes/redirects/
# systemctl --user/etc.). # systemctl --user/etc.).
if [ -n "$argv_mode" ]; then if [ -n "$argv_mode" ]; then
if [ -n "$silent_flag" ]; then if [ -n "$silent_flag" ]; then
sudo -u "$CFG_DOCKER_INSTALL_USER" env --chdir="$run_cwd" "${run_env[@]}" "$@" >/dev/null 2>&1 sudo -u "$CFG_DOCKER_INSTALL_USER" env "${run_env[@]}" "$@" >/dev/null 2>&1
else else
sudo -u "$CFG_DOCKER_INSTALL_USER" env --chdir="$run_cwd" "${run_env[@]}" "$@" sudo -u "$CFG_DOCKER_INSTALL_USER" env "${run_env[@]}" "$@"
fi fi
else else
local remote_command="$1" local remote_command="$1"
if [ -n "$silent_flag" ]; then if [ -n "$silent_flag" ]; then
sudo -u "$CFG_DOCKER_INSTALL_USER" env --chdir="$run_cwd" "${run_env[@]}" bash -c "$remote_command" >/dev/null 2>&1 sudo -u "$CFG_DOCKER_INSTALL_USER" env "${run_env[@]}" bash -c "$remote_command" >/dev/null 2>&1
else else
sudo -u "$CFG_DOCKER_INSTALL_USER" env --chdir="$run_cwd" "${run_env[@]}" bash -c "$remote_command" sudo -u "$CFG_DOCKER_INSTALL_USER" env "${run_env[@]}" bash -c "$remote_command"
fi fi
fi fi
} }