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 02:23:00 +01:00
commit 016f11882e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/function/permission/libreportal_folders.sh
View File

@ -35,9 +35,13 @@ reconcileDockerOwnership()
local logdir="${logs_dir:-$ddir/logs/}" local logdir="${logs_dir:-$ddir/logs/}"
local scrdir="${script_dir:-$ddir/install}" local scrdir="${script_dir:-$ddir/install}"
local dbpath="$ddir/${db_file:-database.db}" local dbpath="$ddir/${db_file:-database.db}"
local appusr="${docker_install_user:-${CFG_DOCKER_INSTALL_USER:-}}" # Read the rootless docker install user AUTHORITATIVELY from config — NOT the
[[ -z "$appusr" ]] && appusr=$(grep -h '^CFG_DOCKER_INSTALL_USER=' "$cfgdir/general/general_docker_install" 2>/dev/null | head -1 | cut -d= -f2 | awk '{print $1}') # lowercase $docker_install_user global, which check_install_type.sh sets to
appusr="${appusr:-dockerinstall}" # the MANAGER user in rooted mode, so during a rooted->rootless switch it's
# stale (=manager) and would mis-own the WebUI dir.
local appusr
appusr=$(grep -h '^CFG_DOCKER_INSTALL_USER=' "$cfgdir/general/general_docker_install" 2>/dev/null | head -1 | cut -d= -f2 | awk '{print $1}')
appusr="${appusr:-${CFG_DOCKER_INSTALL_USER:-dockerinstall}}"
[[ -d "$ddir" ]] || return 0 [[ -d "$ddir" ]] || return 0