Merge claude/1

This commit is contained in:
librelad 2026-05-24 13:39:06 +01:00
commit f8824971d6
3 changed files with 4 additions and 4 deletions

View File

@ -114,6 +114,6 @@ _appReqServiceInstalled()
status=$(dockerCheckAppInstalled "$svc" "docker" 2>/dev/null)
[[ "$status" == "installed" ]] && return 0 || return 1
fi
# Fallback: ask docker directly.
sudo docker ps -a --format '{{.Names}}' 2>/dev/null | grep -q "^${svc}-service$"
# Fallback: ask docker directly (mode-aware: rootless hits the rootless socket).
runFileOp docker ps -a --format '{{.Names}}' 2>/dev/null | grep -q "^${svc}-service$"
}

View File

@ -3,7 +3,7 @@
checkLibrePortalWebUIImageRequirement()
{
if [[ $CFG_REQUIREMENT_WEBUI == "true" ]]; then
if docker images --format "{{.Repository}}:{{.Tag}}" | grep -q "libreportal-service:latest"; then
if runFileOp docker images --format "{{.Repository}}:{{.Tag}}" | grep -q "libreportal-service:latest"; then
isSuccessful "LibrePortal WebUI Docker Image appears to be setup."
else
isNotice "LibrePortal WebUI Docker Image has not been setup."

View File

@ -17,7 +17,7 @@ webuiSystemDisk() {
local docker_percent="0"
if command -v docker &> /dev/null; then
docker_usage=$(docker system df --format "{{.Size}}" | head -1 2>/dev/null || echo "N/A")
docker_usage=$(runFileOp docker system df --format "{{.Size}}" 2>/dev/null | head -1 || echo "N/A")
if [[ "$docker_usage" != "N/A" ]]; then
# Convert Docker usage to GB for calculation
docker_used=$(echo "$docker_usage" | sed 's/GB//g' | sed 's/MB//g' | awk '{print $1*1}' 2>/dev/null || echo "0")