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

Merge claude/1

Browse Source
This commit is contained in:
librelad 2026-05-24 18:38:19 +01:00
commit 4f2fd251fa
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/checks/requirements/check_docker_rootless.sh
View File

@ -4,7 +4,7 @@ checkDockerRootlessRequirement()
{
if [[ $CFG_DOCKER_INSTALL_TYPE == "rootless" ]]; then
### Docker Rootless
if runSystem grep -q "ROOTLESS" $sysctl; then
if grep -q "ROOTLESS" $sysctl; then
isSuccessful "Docker Rootless appears to be installed."
else
isNotice "Docker Rootless does not appear to be installed."

12
scripts/source/loading/scan_files.sh
View File

@ -26,7 +26,7 @@ sourceScanFiles()
# echo "$load_type NEW FILE $file"
fi
fi
done < <(sudo find "$folder_dir" -maxdepth 2 -type f ! -name "*.category" ! -name "config_*" ! -name ".*" -print0)
done < <(find "$folder_dir" -maxdepth 2 -type f ! -name "*.category" ! -name "config_*" ! -name ".*" -print0)
# Per-location backup configs live nested at depth 3
# (configs/backup/locations/<idx>/location.config) — source them via
@ -48,14 +48,20 @@ sourceScanFiles()
echo "Invalid load type: $load_type"
fi
# Scanning function for other types (not libreportal_configs)
# Scanning function for other types (not libreportal_configs).
# app_configs live under /docker/containers (owned by the docker install user
# and not list-readable by the manager), so enumerate them AS that user via
# runFileOp; the manager still sources each (the .config files are o+r). The
# 'containers' install templates are manager-owned, so a plain find suffices.
if [ "$load_type" != "libreportal_configs" ]; then
local scan_op=""
[[ "$load_type" == "app_configs" ]] && scan_op="runFileOp"
while IFS= read -r -d '' file; do
if [ -f "$file" ]; then
source "$file"
# echo "$load_type FILE $file"
fi
done < <(sudo find "$folder_dir" -maxdepth 3 -type d \( -name 'resources' \) -prune -o -type f -name "$file_pattern" -print0)
done < <($scan_op find "$folder_dir" -maxdepth 3 -type d \( -name 'resources' \) -prune -o -type f -name "$file_pattern" -print0)
fi
# Load the categories from the file into an array