diff --git a/.github/workflows/scripts/app-test/pr-build.func b/.github/workflows/scripts/app-test/pr-build.func index edc041ddd..360c15ede 100644 --- a/.github/workflows/scripts/app-test/pr-build.func +++ b/.github/workflows/scripts/app-test/pr-build.func @@ -250,7 +250,7 @@ http://dl-cdn.alpinelinux.org/alpine/latest-stable/community EOF' pct exec "$CTID" -- ash -c "apk add bash >/dev/null" fi - lxc-attach -n "$CTID" -- bash -c "$(< /root/actions-runner/_work/ProxmoxVE/ProxmoxVE/install/$var_install.sh)" + lxc-attach -n "$CTID" -- bash -c "$(cat /root/actions-runner/_work/ProxmoxVE/ProxmoxVE/install/$var_install.sh)" $var_install.sh } diff --git a/.github/workflows/scripts/app-test/pr-install.func b/.github/workflows/scripts/app-test/pr-install.func index 03e82335e..49195f365 100644 --- a/.github/workflows/scripts/app-test/pr-install.func +++ b/.github/workflows/scripts/app-test/pr-install.func @@ -1,28 +1,31 @@ #!/usr/bin/env bash # Copyright (c) 2021-2025 community-scripts ORG -# Author: Michel Roegl-Brunner (michelroegl-brunner) +# Author: michelroegl-brunner # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE color() { return } + +SCRIPT_NAME="${BASH_SOURCE[0]:-unknown_script}" catch_errors() { - set -Eeuo pipefail + set -Euoe pipefail trap 'error_handler $LINENO "$BASH_COMMAND"' ERR } - error_handler() { local line_number="$1" local command="$2" - SCRIPT_NAME=$(basename "$0") - local error_message="$SCRIPT_NAME: Failure in line $line_number while executing command $command" + local error_message="$SCRIPT_NAME: Failure in line $line_number while executing command '$command'" echo -e "\n$error_message" - exit 200 + exit 300 } + verb_ip6() { - STD="" - return + STD="silent" + silent() { + "$@" >/dev/null 2>&1 || error_handler "${BASH_LINENO[0]}" "$*" + } } msg_info() { @@ -40,11 +43,9 @@ msg_error() { local msg="$1" echo -e "${msg}\n" } - -RETRY_NUM=10 -RETRY_EVERY=3 + RETRY_NUM=10 + RETRY_EVERY=3 setting_up_container() { - sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen locale_line=$(grep -v '^#' /etc/locale.gen | grep -E '^[a-zA-Z]' | awk '{print $1}' | head -n 1) echo "LANG=${locale_line}" >/etc/default/locale @@ -57,6 +58,7 @@ setting_up_container() { if [ "$(hostname -I)" != "" ]; then break fi + echo 1>&2 -en "No Network! " sleep $RETRY_EVERY done if [ "$(hostname -I)" = "" ]; then @@ -66,6 +68,8 @@ setting_up_container() { fi rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED systemctl disable -q --now systemd-networkd-wait-online.service + msg_ok "Set up Container OS" + msg_ok "Network Connected: $(hostname -I)" } network_check() { @@ -75,10 +79,11 @@ network_check() { } update_os() { - export DEBIAN_FRONTEND=noninteractive - apt-get update >/dev/null 2>&1 - apt-get -o Dpkg::Options::="--force-confold" -y dist-upgrade >/dev/null 2>&1 - rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED + msg_info "Updating Container OS" + apt-get update + apt-get -o Dpkg::Options::="--force-confold" -y dist-upgrade + rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED + msg_ok "Updated Container OS" } motd_ssh() { @@ -87,6 +92,4 @@ motd_ssh() { customize() { return -} - - +} \ No newline at end of file