2d24a764a8
Two mechanical sweeps, no behaviour change on a single-root install. The 14 `[[ "$p" == "$containers_dir"* ]]` prefix tests that decide manager-vs-container-user elevation become pathIsContainerData, so a file on a second storage root is no longer misclassified as manager-owned — which would have written it with the wrong owner and failed later, far from the cause. The 65 references to the WebUI's own tree become webuiDir(), which is pinned to the primary root by design. Two traps found while doing it: run_privileged.sh is sourced directly by init.sh without paths.sh, so it needs a fallback. Defining one named pathIsContainerData was wrong: generate_function_manifest.sh indexes top-level definitions, and the resulting autoload stub would have shadowed the real multi-root implementation with the primary-only fallback — silently classifying every file on a second disk as manager-owned, which is exactly the bug this sweep exists to prevent. Renamed to _runCfgIsContainerPath, which delegates when the real one is loaded. setup_lock.sh built its path in a top-level assignment, so it was evaluated at source time and needed the file flagged eager. Made it a function instead: the path resolves on call, and the file drops off LP_EAGER_FILES entirely. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
31 lines
1.3 KiB
Bash
Executable File
31 lines
1.3 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
copyFolder()
|
|
{
|
|
local folder="$1"
|
|
local folder_name=$(basename "$folder")
|
|
local save_dir="$2"
|
|
local user_name="$3" # advisory — the destination path determines the owner
|
|
|
|
# Write as the destination's owner — no root, no chown (see copyFile).
|
|
if pathIsContainerData "$save_dir"; then
|
|
if pathIsContainerData "$folder"; then
|
|
# container -> container: same owner (dockerinstall), a plain cp works.
|
|
local result; result=$(runFileOp cp -rf "$folder" "$save_dir")
|
|
else
|
|
# Cross-owner: a manager-owned source (e.g. the install dir) into the
|
|
# container-owned destination. Under rootless a single cp can't read
|
|
# one end and write the other, so bridge with a tar pipe — the manager
|
|
# reads the source, dockerinstall writes the destination. No root, no
|
|
# chown; files land owned by the destination user. pipefail so a
|
|
# read-side failure isn't masked by a "successful" empty extract.
|
|
( set -o pipefail
|
|
runInstallOp tar -C "$(dirname "$folder")" -cf - "$folder_name" \
|
|
| runFileOp tar -C "$save_dir" -xf - )
|
|
fi
|
|
else
|
|
local result; result=$(runInstallOp cp -rf "$folder" "$save_dir")
|
|
fi
|
|
checkSuccess "Copying $folder_name to $save_dir"
|
|
}
|