From 59d684731d0918fe59e6f8fd58f696b7648c1a1a Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Tue, 11 Nov 2025 11:16:03 +0100
Subject: [PATCH] fixing outputs

---
 misc/core.func  | 31 +++++++++++++++++--------------
 misc/tools.func |  5 +++--
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/misc/core.func b/misc/core.func
index df35d1e8c..89545da48 100644
--- a/misc/core.func
+++ b/misc/core.func
@@ -422,6 +422,7 @@ function msg_debug() {
 
 cleanup_lxc() {
   msg_info "Cleaning up"
+
   if is_alpine; then
     $STD apk cache clean || true
     rm -rf /var/cache/apk/*
@@ -431,36 +432,38 @@ cleanup_lxc() {
     $STD apt -y clean || true
   fi
 
-  rm -rf /tmp/* /var/tmp/*
-
-  # Remove temp files created by mktemp/tempfile
+  # Clear temp artifacts (keep sockets/FIFOs; ignore errors)
   find /tmp /var/tmp -type f -name 'tmp*' -delete 2>/dev/null || true
   find /tmp /var/tmp -type f -name 'tempfile*' -delete 2>/dev/null || true
 
-  find /var/log -type f -exec truncate -s 0 {} +
+  # Truncate writable log files silently (permission errors ignored)
+  if command -v truncate >/dev/null 2>&1; then
+    find /var/log -type f -writable -print0 2>/dev/null |
+      xargs -0 -n1 truncate -s 0 2>/dev/null || true
+  fi
 
   # Python pip
-  if command -v pip &>/dev/null; then pip cache purge || true; fi
+  if command -v pip &>/dev/null; then $STD pip cache purge || true; fi
   # Python uv
-  if command -v uv &>/dev/null; then uv cache clear || true; fi
+  if command -v uv &>/dev/null; then $STD uv cache clear || true; fi
   # Node.js npm
-  if command -v npm &>/dev/null; then npm cache clean --force || true; fi
+  if command -v npm &>/dev/null; then $STD npm cache clean --force || true; fi
   # Node.js yarn
-  if command -v yarn &>/dev/null; then yarn cache clean || true; fi
+  if command -v yarn &>/dev/null; then $STD yarn cache clean || true; fi
   # Node.js pnpm
-  if command -v pnpm &>/dev/null; then pnpm store prune || true; fi
+  if command -v pnpm &>/dev/null; then $STD pnpm store prune || true; fi
   # Go
-  if command -v go &>/dev/null; then go clean -cache -modcache || true; fi
+  if command -v go &>/dev/null; then $STD go clean -cache -modcache || true; fi
   # Rust cargo
-  if command -v cargo &>/dev/null; then cargo clean || true; fi
+  if command -v cargo &>/dev/null; then $STD cargo clean || true; fi
   # Ruby gem
-  if command -v gem &>/dev/null; then gem cleanup || true; fi
+  if command -v gem &>/dev/null; then $STD gem cleanup || true; fi
   # Composer (PHP)
   if command -v composer &>/dev/null; then $STD composer clear-cache || true; fi
 
   if command -v journalctl &>/dev/null; then
-    $STD journalctl --rotate
-    $STD journalctl --vacuum-time=10m
+    $STD journalctl --rotate || true
+    $STD journalctl --vacuum-time=10m || true
   fi
   msg_ok "Cleaned"
 }
diff --git a/misc/tools.func b/misc/tools.func
index bacce96df..00ee8d815 100644
--- a/misc/tools.func
+++ b/misc/tools.func
@@ -2779,8 +2779,9 @@ function setup_java() {
   fi
 
   # Validate INSTALLED_VERSION is not empty if matched
-  local JDK_COUNT=$(dpkg -l 2>/dev/null | grep -c "temurin-.*-jdk" || echo "0")
-  if [[ -z "$INSTALLED_VERSION" && "$JDK_COUNT" -gt 0 ]]; then
+  local JDK_COUNT=0
+  JDK_COUNT=$(dpkg -l 2>/dev/null | grep -c "temurin-.*-jdk" || echo "0")
+  if [[ -z "$INSTALLED_VERSION" && "${JDK_COUNT:-0}" -gt 0 ]]; then
     msg_warn "Found Temurin JDK but cannot determine version"
     INSTALLED_VERSION="0"
   fi