053a620e22
'local result=$(cmd)' resets $? to 0 (the local builtin's own exit), so the
following checkSuccess always saw success regardless of cmd's real exit — the
mechanism that masked the de-sudo write failures. Split declaration from
assignment ('local result; result=$(cmd)') across all 235 active-code sites
(84 files) so the command's exit reaches checkSuccess. No behaviour change
beyond $? now being accurate (no set -e in runtime code; multi-line
assignments transform safely).
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Signed-off-by: librelad <librelad@digitalangels.vip>
31 lines
1.5 KiB
Bash
Executable File
31 lines
1.5 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 [[ "$save_dir" == "$containers_dir"* || "$save_dir" == "${LP_CONTAINERS_DIR:-/libreportal-containers}"/* ]]; then
|
|
if [[ "$folder" == "$containers_dir"* || "$folder" == "${LP_CONTAINERS_DIR:-/libreportal-containers}"/* ]]; 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"
|
|
}
|