From b93f8ce5febca0eb816349f442d02564703095a2 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Tue, 22 Jul 2025 11:56:25 +0200 Subject: [PATCH] logging --- misc/build.func | 2 +- misc/tools.func | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/misc/build.func b/misc/build.func index 61ba50dc..e9247b9d 100644 --- a/misc/build.func +++ b/misc/build.func @@ -1438,7 +1438,7 @@ EOF' msg_ok "Customized LXC Container" if ! lxc-attach -n "$CTID" -- bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/install/"$var_install".sh)"; then - return + exit $? fi } diff --git a/misc/tools.func b/misc/tools.func index 6d932e03..dace8ca7 100644 --- a/misc/tools.func +++ b/misc/tools.func @@ -419,7 +419,7 @@ function setup_php() { # Deduplicate COMBINED_MODULES=$(echo "$COMBINED_MODULES" | tr ',' '\n' | awk '!seen[$0]++' | paste -sd, -) - # Aktuelle PHP-CLI-Version ermitteln + # Get current PHP-CLI version local CURRENT_PHP="" if command -v php >/dev/null 2>&1; then CURRENT_PHP=$(php -v 2>/dev/null | awk '/^PHP/{print $2}' | cut -d. -f1,2) @@ -441,7 +441,7 @@ function setup_php() { $STD apt-get update fi - # Modul-Liste bauen + # Build module list local MODULE_LIST="php${PHP_VERSION}" IFS=',' read -ra MODULES <<<"$COMBINED_MODULES" for mod in "${MODULES[@]}"; do @@ -455,7 +455,7 @@ function setup_php() { MODULE_LIST+=" php${PHP_VERSION}-fpm" fi - # Apache + PHP-Modul nur installieren, wenn noch nicht vorhanden + # install apache2 with PHP support if requested if [[ "$PHP_APACHE" == "YES" ]]; then if ! dpkg -l | grep -q "libapache2-mod-php${PHP_VERSION}"; then msg_info "Installing Apache with PHP${PHP_VERSION} support" @@ -502,7 +502,7 @@ function setup_php() { $STD systemctl restart apache2 || true fi - # FPM aktivieren, falls gewünscht + # enable and restart PHP-FPM if requested if [[ "$PHP_FPM" == "YES" ]]; then if systemctl list-unit-files | grep -q "php${PHP_VERSION}-fpm.service"; then $STD systemctl enable php${PHP_VERSION}-fpm