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>
37 lines
1.5 KiB
Bash
Executable File
37 lines
1.5 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
createFolders()
|
|
{
|
|
local silent_flag="$1"
|
|
local user_name="$2"
|
|
|
|
for dir_path in "${@:3}"; do
|
|
local folder_name=$(basename "$dir_path")
|
|
local clean_dir=$(echo "$dir_path" | sed 's#//*#/#g')
|
|
|
|
# Under /docker/containers/<app>/ the owner is the docker install user
|
|
# (the rootless container + host generators run as it), so create the dir
|
|
# AS that user via runFileOp — creating it as the right owner avoids a
|
|
# chown-to-another-user the unprivileged runtime can't do. Mirrors
|
|
# createTouch; the $user_name hint is advisory for these paths.
|
|
if pathIsContainerData "$clean_dir"; then
|
|
if [ ! -d "$dir_path" ]; then
|
|
local result; result=$(runFileOp mkdir -p "$dir_path")
|
|
[ "$silent_flag" == "loud" ] && checkSuccess "Creating $folder_name directory"
|
|
elif [ "$silent_flag" == "loud" ]; then
|
|
isNotice "$folder_name directory already exists"
|
|
fi
|
|
continue
|
|
fi
|
|
|
|
# Non-container path = manager-owned control plane -> create AS the
|
|
# manager (runInstallOp); no root, no chown.
|
|
if [ ! -d "$dir_path" ]; then
|
|
local result; result=$(runInstallOp mkdir -p "$dir_path")
|
|
[ "$silent_flag" == "loud" ] && checkSuccess "Creating $folder_name directory"
|
|
elif [ "$silent_flag" == "loud" ]; then
|
|
isNotice "$folder_name directory already exists"
|
|
fi
|
|
done
|
|
}
|