Replace init_error_traps with catch_errors in scripts
Some checks failed
Bump build.func Revision / bump-revision (push) Has been cancelled

Replaces all occurrences of the 'init_error_traps' function with 'catch_errors' across container and install scripts for consistency in error handling. Also adjusts indentation and formatting in some scripts for improved readability.
This commit is contained in:
CanbiZ 2025-09-19 08:53:49 +02:00
parent fe3de07157
commit b840a8aa32
107 changed files with 497 additions and 498 deletions

View File

@ -17,24 +17,24 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info
check_container_storage check_container_storage
check_container_resources check_container_resources
if [[ ! -d /etc/caddy ]]; then if [[ ! -d /etc/caddy ]]; then
msg_error "No ${APP} Installation Found!" msg_error "No ${APP} Installation Found!"
exit exit
fi fi
msg_info "Updating $APP LXC" msg_info "Updating $APP LXC"
$STD apk -U upgrade $STD apk -U upgrade
msg_ok "Updated $APP LXC" msg_ok "Updated $APP LXC"
msg_info "Restarting Caddy" msg_info "Restarting Caddy"
rc-service caddy restart rc-service caddy restart
msg_ok "Restarted Caddy" msg_ok "Restarted Caddy"
exit exit
} }
start start

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -19,7 +19,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -18,7 +18,7 @@ header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -18,7 +18,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="1"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -19,7 +19,7 @@ var_tun="${var_tun:-yes}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="1"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -26,7 +26,7 @@ var_os="${var_os:-debian}"
var_version="${var_version:-12}" var_version="${var_version:-12}"
variables variables
color color
init_error_traps catch_errors
function default_settings() { function default_settings() {
CT_TYPE="1" CT_TYPE="1"

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -16,7 +16,7 @@ var_version="${var_version:-12}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -16,7 +16,7 @@ var_unprivileged="${var_unprivileged:-1}"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -18,7 +18,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -18,7 +18,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-0}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
# this only updates garmin-grafana, not influxdb or grafana, which are upgraded with apt # this only updates garmin-grafana, not influxdb or grafana, which are upgraded with apt
function update_script() { function update_script() {

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -16,21 +16,21 @@ var_version="${var_version:-13}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info
check_container_storage check_container_storage
check_container_resources check_container_resources
if [[ ! -f /usr/sbin/globaleaks ]]; then if [[ ! -f /usr/sbin/globaleaks ]]; then
msg_error "No ${APP} installation found!" msg_error "No ${APP} installation found!"
exit exit
fi fi
msg_info "Updating $APP LXC" msg_info "Updating $APP LXC"
$STD apt update $STD apt update
$STD apt -y upgrade $STD apt -y upgrade
msg_ok "Updated $APP LXC" msg_ok "Updated $APP LXC"
} }
start start

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
UPD=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UPDATE MODE" --radiolist --cancel-button Exit-Script "Spacebar = Select" 14 60 2 \ UPD=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UPDATE MODE" --radiolist --cancel-button Exit-Script "Spacebar = Select" 14 60 2 \

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -18,7 +18,7 @@ var_fuse="${var_fuse:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info
check_container_storage check_container_storage

View File

@ -19,7 +19,7 @@ var_unprivileged="${var_unprivileged:-0}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -14,7 +14,7 @@ header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -22,7 +22,7 @@ base_settings
# Core # Core
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
header_info "$APP" header_info "$APP"
variables variables
color color
init_error_traps catch_errors
function update_script() { function update_script() {
header_info header_info

View File

@ -8,14 +8,14 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os
msg_info "Installing Caddy" msg_info "Installing Caddy"
$STD apk add --no-cache caddy caddy-openrc $STD apk add --no-cache caddy caddy-openrc
cat<<EOF >/etc/caddy/Caddyfile cat <<EOF >/etc/caddy/Caddyfile
:80 { :80 {
# Set this path to your site's directory. # Set this path to your site's directory.
root * /var/www/html root * /var/www/html
@ -31,7 +31,7 @@ cat<<EOF >/etc/caddy/Caddyfile
} }
EOF EOF
mkdir -p /var/www/html mkdir -p /var/www/html
cat<<EOF >/var/www/html/index.html cat <<EOF >/var/www/html/index.html
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
@ -47,15 +47,15 @@ msg_ok "Installed Caddy"
read -r -p "${TAB3}Would you like to install xCaddy Addon? <y/N> " prompt read -r -p "${TAB3}Would you like to install xCaddy Addon? <y/N> " prompt
if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
GO_VERSION="$(curl -fsSL https://go.dev/VERSION?m=text | head -1 | cut -c3-)" setup_go GO_VERSION="$(curl -fsSL https://go.dev/VERSION?m=text | head -1 | cut -c3-)" setup_go
msg_info "Setup xCaddy" msg_info "Setup xCaddy"
cd /opt cd /opt
RELEASE=$(curl -fsSL https://api.github.com/repos/caddyserver/xcaddy/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') RELEASE=$(curl -fsSL https://api.github.com/repos/caddyserver/xcaddy/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
curl -fsSL "https://github.com/caddyserver/xcaddy/releases/download/${RELEASE}/xcaddy_${RELEASE:1}_linux_amd64.tar.gz" -o "xcaddy_${RELEASE:1}_linux_amd64.tar.gz" curl -fsSL "https://github.com/caddyserver/xcaddy/releases/download/${RELEASE}/xcaddy_${RELEASE:1}_linux_amd64.tar.gz" -o "xcaddy_${RELEASE:1}_linux_amd64.tar.gz"
$STD tar xzf xcaddy_"${RELEASE:1}"_linux_amd64.tar.gz -C /usr/local/bin xcaddy $STD tar xzf xcaddy_"${RELEASE:1}"_linux_amd64.tar.gz -C /usr/local/bin xcaddy
rm -rf /opt/xcaddy* rm -rf /opt/xcaddy*
$STD xcaddy build $STD xcaddy build
msg_ok "Setup xCaddy" msg_ok "Setup xCaddy"
fi fi
msg_info "Enabling Caddy Service" msg_info "Enabling Caddy Service"

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -9,7 +9,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -9,7 +9,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -9,7 +9,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -9,7 +9,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -10,7 +10,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@ source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -7,7 +7,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -7,7 +7,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -12,7 +12,7 @@ INSTALL_PATH="/opt/sng_freepbx_debian_install.sh"
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -9,7 +9,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -7,7 +7,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -7,7 +7,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -9,7 +9,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os
@ -16,18 +16,18 @@ update_os
msg_info "Setting Up Hardware Acceleration" msg_info "Setting Up Hardware Acceleration"
$STD apt-get -y install {va-driver-all,ocl-icd-libopencl1,intel-opencl-icd,vainfo,intel-gpu-tools} $STD apt-get -y install {va-driver-all,ocl-icd-libopencl1,intel-opencl-icd,vainfo,intel-gpu-tools}
if [[ "$CTTYPE" == "0" ]]; then if [[ "$CTTYPE" == "0" ]]; then
chgrp video /dev/dri chgrp video /dev/dri
chmod 755 /dev/dri chmod 755 /dev/dri
chmod 660 /dev/dri/* chmod 660 /dev/dri/*
$STD adduser $(id -u -n) video $STD adduser $(id -u -n) video
$STD adduser $(id -u -n) render $STD adduser $(id -u -n) render
fi fi
msg_ok "Set Up Hardware Acceleration" msg_ok "Set Up Hardware Acceleration"
read -r -p "${TAB3}Do you need the intel-media-va-driver-non-free driver for HW encoding (Debian 12 only)? <y/N> " prompt read -r -p "${TAB3}Do you need the intel-media-va-driver-non-free driver for HW encoding (Debian 12 only)? <y/N> " prompt
if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
msg_info "Installing Intel Hardware Acceleration (non-free)" msg_info "Installing Intel Hardware Acceleration (non-free)"
cat <<EOF >/etc/apt/sources.list.d/non-free.list cat <<EOF >/etc/apt/sources.list.d/non-free.list
deb http://deb.debian.org/debian bookworm non-free non-free-firmware deb http://deb.debian.org/debian bookworm non-free non-free-firmware
deb-src http://deb.debian.org/debian bookworm non-free non-free-firmware deb-src http://deb.debian.org/debian bookworm non-free non-free-firmware
@ -38,11 +38,11 @@ deb-src http://deb.debian.org/debian-security bookworm-security non-free non-fre
deb http://deb.debian.org/debian bookworm-updates non-free non-free-firmware deb http://deb.debian.org/debian bookworm-updates non-free non-free-firmware
deb-src http://deb.debian.org/debian bookworm-updates non-free non-free-firmware deb-src http://deb.debian.org/debian bookworm-updates non-free non-free-firmware
EOF EOF
$STD apt-get update $STD apt-get update
$STD apt-get -y install {intel-media-va-driver-non-free,ocl-icd-libopencl1,intel-opencl-icd,vainfo,intel-gpu-tools} $STD apt-get -y install {intel-media-va-driver-non-free,ocl-icd-libopencl1,intel-opencl-icd,vainfo,intel-gpu-tools}
else else
msg_info "Installing Intel Hardware Acceleration" msg_info "Installing Intel Hardware Acceleration"
$STD apt-get -y install {va-driver-all,ocl-icd-libopencl1,intel-opencl-icd,vainfo,intel-gpu-tools} $STD apt-get -y install {va-driver-all,ocl-icd-libopencl1,intel-opencl-icd,vainfo,intel-gpu-tools}
fi fi
msg_ok "Installed and Set Up Intel Hardware Acceleration" msg_ok "Installed and Set Up Intel Hardware Acceleration"

View File

@ -8,7 +8,7 @@
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH" source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
color color
verb_ip6 verb_ip6
init_error_traps catch_errors
setting_up_container setting_up_container
network_check network_check
update_os update_os

Some files were not shown because too many files have changed in this diff Show More