diff --git a/tools/addon/coder-code-server.sh b/tools/addon/coder-code-server.sh index 95039aebe..9455a3465 100644 --- a/tools/addon/coder-code-server.sh +++ b/tools/addon/coder-code-server.sh @@ -5,62 +5,39 @@ # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE # Source: https://coder.com/ | Github: https://github.com/coder/code-server -function header_info { - cat <<"EOF" - ______ __ _____ - / ____/___ ____/ /__ / ___/___ ______ _____ _____ - / / / __ \/ __ / _ \ \__ \/ _ \/ ___/ | / / _ \/ ___/ -/ /___/ /_/ / /_/ / __/ ___/ / __/ / | |/ / __/ / -\____/\____/\__,_/\___/ /____/\___/_/ |___/\___/_/ - -EOF -} -IP=$(hostname -I | awk '{print $1}') -YW=$(echo "\033[33m") -BL=$(echo "\033[36m") -RD=$(echo "\033[01;31m") -BGN=$(echo "\033[4;92m") -GN=$(echo "\033[1;92m") -DGN=$(echo "\033[32m") -CL=$(echo "\033[m") -BFR="\\r\\033[K" -HOLD="-" -CM="${GN}✓${CL}" -APP="Coder Code Server" -hostname="$(hostname)" - -# Telemetry +source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func) +source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func) +source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func) source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "coder-code-server" "addon" -set -o errexit -set -o errtrace -set -o nounset -set -o pipefail -shopt -s expand_aliases -alias die='EXIT=$? LINE=$LINENO error_exit' -trap die ERR +# Enable error handling +set -Eeuo pipefail +trap 'error_handler' ERR + +APP="Coder Code Server" +APP_TYPE="addon" + +# Initialize all core functions (colors, formatting, icons, STD mode) +load_functions -function error_exit() { - trap - ERR - local reason="Unknown failure occured." - local msg="${1:-$reason}" - local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE" - echo -e "$flag $msg" 1>&2 - exit "$EXIT" -} -clear header_info + if command -v pveversion >/dev/null 2>&1; then - echo -e "⚠️ Can't Install on Proxmox " - exit + msg_error "Can't Install on Proxmox" + exit 1 fi if [ -e /etc/alpine-release ]; then - echo -e "⚠️ Can't Install on Alpine" - exit + msg_error "Can't Install on Alpine" + exit 1 fi + +get_lxc_ip +IP="$LOCAL_IP" + while true; do - read -p "This will Install ${APP} on $hostname. Proceed(y/n)?" yn + echo -n "${TAB}This will Install ${APP}. Proceed (y/n)? " + read -r yn case $yn in [Yy]*) break ;; [Nn]*) exit ;; @@ -68,20 +45,10 @@ while true; do esac done -function msg_info() { - local msg="$1" - echo -ne " ${HOLD} ${YW}${msg}..." -} - -function msg_ok() { - local msg="$1" - echo -e "${BFR} ${CM} ${GN}${msg}${CL}" -} - msg_info "Installing Dependencies" -apt-get update &>/dev/null -apt-get install -y curl &>/dev/null -apt-get install -y git &>/dev/null +$STD apt-get update +$STD apt-get install -y curl +$STD apt-get install -y git msg_ok "Installed Dependencies" VERSION=$(curl -fsSL https://api.github.com/repos/coder/code-server/releases/latest | @@ -96,8 +63,8 @@ if [ -f "$config_path" ]; then preexisting_config=true fi -curl -fOL https://github.com/coder/code-server/releases/download/v"$VERSION"/code-server_"${VERSION}"_amd64.deb &>/dev/null -dpkg -i code-server_"${VERSION}"_amd64.deb &>/dev/null +$STD curl -fOL https://github.com/coder/code-server/releases/download/v"$VERSION"/code-server_"${VERSION}"_amd64.deb +$STD dpkg -i code-server_"${VERSION}"_amd64.deb rm -rf code-server_"${VERSION}"_amd64.deb mkdir -p "${HOME}/.config/code-server/" @@ -112,9 +79,10 @@ fi systemctl enable -q --now code-server@"$USER" systemctl restart code-server@"$USER" if ! systemctl is-active --quiet code-server@"$USER"; then - error_exit "code-server service failed to start." + msg_error "code-server service failed to start." + exit 1 fi -msg_ok "Installed Code-Server v${VERSION} on $hostname" +msg_ok "Installed Code-Server v${VERSION}" echo -e "${APP} should be reachable by going to the following URL. - ${BL}http://$IP:8680${CL} \n" + ${BL}http://${IP}:8680${CL} \n" diff --git a/tools/addon/crowdsec.sh b/tools/addon/crowdsec.sh index 11ec83320..97618132c 100644 --- a/tools/addon/crowdsec.sh +++ b/tools/addon/crowdsec.sh @@ -5,89 +5,53 @@ # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE # Source: https://www.crowdsec.net/ | Github: https://github.com/crowdsecurity/crowdsec -YW=$(echo "\033[33m") -BL=$(echo "\033[36m") -RD=$(echo "\033[01;31m") -BGN=$(echo "\033[4;92m") -GN=$(echo "\033[1;92m") -DGN=$(echo "\033[32m") -CL=$(echo "\033[m") -BFR="\\r\\033[K" -HOLD="-" -CM="${GN}✓${CL}" APP="CrowdSec" -hostname="$(hostname)" +APP_TYPE="addon" -# Telemetry +source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func) +source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func) +source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func) source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "crowdsec" "addon" -set -o errexit -set -o errtrace -set -o nounset -set -o pipefail -shopt -s expand_aliases -alias die='EXIT=$? LINE=$LINENO error_exit' -trap die ERR +# Enable error handling +set -Eeuo pipefail +trap 'error_handler' ERR + +# Initialize all core functions (colors, formatting, icons, STD mode) +load_functions + +header_info -function error_exit() { - trap - ERR - local reason="Unknown failure occured." - local msg="${1:-$reason}" - local flag="${RD}‼ ERROR ${CL}$EXIT@$LINE" - echo -e "$flag $msg" 1>&2 - exit "$EXIT" -} if command -v pveversion >/dev/null 2>&1; then - echo -e "⚠️ Can't Install on Proxmox " - exit + msg_error "Can't Install on Proxmox" + exit 1 fi + while true; do - read -p "This will Install ${APP} on $hostname. Proceed(y/n)?" yn + echo -n "${TAB}This will Install ${APP}. Proceed (y/n)? " + read -r yn case $yn in [Yy]*) break ;; [Nn]*) exit ;; *) echo "Please answer yes or no." ;; esac done -clear -function header_info() { - echo -e "${BL} - _____ _ _____ - / ____| | |/ ____| - | | _ __ _____ ____| | (___ ___ ___ - | | | __/ _ \ \ /\ / / _ |\___ \ / _ \/ __| - | |____| | | (_) \ V V / (_| |____) | __/ (__ - \_____|_| \___/ \_/\_/ \__ _|_____/ \___|\___| -${CL}" -} - -header_info - -function msg_info() { - local msg="$1" - echo -ne " ${HOLD} ${YW}${msg}..." -} - -function msg_ok() { - local msg="$1" - echo -e "${BFR} ${CM} ${GN}${msg}${CL}" -} msg_info "Setting up ${APP} Repository" -apt-get update &>/dev/null -apt-get install -y curl &>/dev/null -apt-get install -y gnupg &>/dev/null -curl -fsSL "https://install.crowdsec.net" | bash &>/dev/null +$STD apt-get update +$STD apt-get install -y curl +$STD apt-get install -y gnupg +$STD bash -c "curl -fsSL https://install.crowdsec.net | bash" msg_ok "Setup ${APP} Repository" msg_info "Installing ${APP}" -apt-get update &>/dev/null -apt-get install -y crowdsec &>/dev/null -msg_ok "Installed ${APP} on $hostname" +$STD apt-get update +$STD apt-get install -y crowdsec +msg_ok "Installed ${APP}" msg_info "Installing ${APP} Common Bouncer" -apt-get install -y crowdsec-firewall-bouncer-iptables &>/dev/null +$STD apt-get install -y crowdsec-firewall-bouncer-iptables msg_ok "Installed ${APP} Common Bouncer" msg_ok "Completed successfully!\n" diff --git a/tools/addon/filebrowser.sh b/tools/addon/filebrowser.sh index a7db5f122..369c91767 100644 --- a/tools/addon/filebrowser.sh +++ b/tools/addon/filebrowser.sh @@ -5,17 +5,6 @@ # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE # Source: https://filebrowser.org/ | Github: https://github.com/filebrowser/filebrowser -function header_info { - clear - cat <<"EOF" - _______ __ ____ - / ____(_) /__ / __ )_________ _ __________ _____ - / /_ / / / _ \/ __ / ___/ __ \ | /| / / ___/ _ \/ ___/ - / __/ / / / __/ /_/ / / / /_/ / |/ |/ (__ ) __/ / -/_/ /_/_/\___/_____/_/ \____/|__/|__/____/\___/_/ -EOF -} - YW=$(echo "\033[33m") GN=$(echo "\033[1;92m") RD=$(echo "\033[01;31m") @@ -26,20 +15,19 @@ CROSS="${RD}✖️${CL}" INFO="${BL}ℹ️${CL}" APP="FileBrowser" +APP_TYPE="addon" INSTALL_PATH="/usr/local/bin/filebrowser" DB_PATH="/usr/local/community-scripts/filebrowser.db" DEFAULT_PORT=8080 # Telemetry +source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/core.func) +load_functions source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) 2>/dev/null || true declare -f init_tool_telemetry &>/dev/null && init_tool_telemetry "filebrowser" "addon" -# Get first non-loopback IP & Detect primary network interface dynamically -IFACE=$(ip -4 route | awk '/default/ {print $5; exit}') -IP=$(ip -4 addr show "$IFACE" | awk '/inet / {print $2}' | cut -d/ -f1 | head -n 1) - -[[ -z "$IP" ]] && IP=$(hostname -I | awk '{print $1}') -[[ -z "$IP" ]] && IP="127.0.0.1" +get_lxc_ip +IP="$LOCAL_IP" # Proxmox Host Warning if [[ -d "/etc/pve" ]]; then