From 0cd72e9f390ad0ae58e999ad029033a083bab13f Mon Sep 17 00:00:00 2001 From: Frans Stofberg Date: Sun, 2 Nov 2025 09:51:36 +0200 Subject: [PATCH] Remove files not needed for PR --- ct/donetick.sh | 2 +- misc/build.func | 6 +- misc/install.func | 2 +- tools/addon/glances.sh | 202 +++++++++++++++++++++++++++++++++++++++ tools/pve/update-apps.sh | 8 +- 5 files changed, 211 insertions(+), 9 deletions(-) diff --git a/ct/donetick.sh b/ct/donetick.sh index 01643334a..111da67fb 100644 --- a/ct/donetick.sh +++ b/ct/donetick.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -source <(curl -fsSL https://raw.githubusercontent.com/fstof/ProxmoxVED/refs/heads/donetick/misc/build.func) +source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func) # Copyright (c) 2021-2025 community-scripts ORG # Author: fstof # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE diff --git a/misc/build.func b/misc/build.func index 797f2b405..eb2183872 100644 --- a/misc/build.func +++ b/misc/build.func @@ -48,7 +48,7 @@ variables() { # FUNC_DIR="/usr/local/community-scripts/core" # mkdir -p "$FUNC_DIR" -# BUILD_URL="https://raw.githubusercontent.com/fstof/ProxmoxVED/refs/heads/donetick/misc/build.func" +# BUILD_URL="https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func" # BUILD_REV="$FUNC_DIR/build.rev" # DEVMODE="${DEVMODE:-no}" @@ -73,7 +73,7 @@ variables() { # update_func_file() { # local file="$1" -# local url="https://raw.githubusercontent.com/fstof/ProxmoxVED/refs/heads/donetick/misc/$file" +# local url="https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/$file" # local local_path="$FUNC_DIR/$file" # echo "⬇️ Downloading $file ..." @@ -2488,7 +2488,7 @@ EOF' install_ssh_keys_into_ct # Run application installer - if ! lxc-attach -n "$CTID" -- bash -c "$(curl -fsSL https://raw.githubusercontent.com/fstof/ProxmoxVED/refs/heads/donetick/install/${var_install}.sh)"; then + if ! lxc-attach -n "$CTID" -- bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/install/${var_install}.sh)"; then exit $? fi } diff --git a/misc/install.func b/misc/install.func index f3b805a8d..f741b921d 100644 --- a/misc/install.func +++ b/misc/install.func @@ -32,7 +32,7 @@ verb_ip6() { # # This function handles errors # error_handler() { -# source <(curl -fsSL https://raw.githubusercontent.com/fstof/ProxmoxVED/refs/heads/donetick/misc/api.func) +# source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/api.func) # local exit_code="$1" # local line_number="$2" # local command="${3:-}" diff --git a/tools/addon/glances.sh b/tools/addon/glances.sh index 3cf0d6ab3..d3c7b03dd 100644 --- a/tools/addon/glances.sh +++ b/tools/addon/glances.sh @@ -4,6 +4,14 @@ # Author: tteck (tteckster) | MickLesk (CanbiZ) # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE +function header_info { + clear + cat <<"EOF"#!/usr/bin/env bash + +# Copyright (c) 2021-2025 tteck +# Author: tteck (tteckster) | MickLesk (CanbiZ) +# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE + function header_info { clear cat <<"EOF" @@ -41,6 +49,200 @@ get_local_ip() { } IP=$(get_local_ip) +install_glances_debian() { + msg_info "Installing dependencies" + apt-get update >/dev/null 2>&1 + apt-get install -y gcc lm-sensors wireless-tools >/dev/null 2>&1 + msg_ok "Installed dependencies" + + msg_info "Setting up Python + uv" + source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/tools.func) + setup_uv PYTHON_VERSION="3.12" + msg_ok "Setup Python + uv" + + msg_info "Installing $APP (with web UI)" + cd /opt + mkdir -p glances + cd glances + uv venv + source .venv/bin/activate >/dev/null 2>&1 + uv pip install --upgrade pip wheel setuptools >/dev/null 2>&1 + uv pip install "glances[web]" >/dev/null 2>&1 + deactivate + msg_ok "Installed $APP" + + msg_info "Creating systemd service" + cat </etc/systemd/system/glances.service +[Unit] +Description=Glances - An eye on your system +After=network.target + +[Service] +Type=simple +ExecStart=/opt/glances/.venv/bin/glances -w +Restart=on-failure +WorkingDirectory=/opt/glances + +[Install] +WantedBy=multi-user.target +EOF + systemctl enable -q --now glances + msg_ok "Created systemd service" + + echo -e "\n$APP is now running at: http://$IP:61208\n" +} + +# update on Debian/Ubuntu +update_glances_debian() { + if [[ ! -d /opt/glances/.venv ]]; then + msg_error "$APP is not installed" + exit 1 + fi + msg_info "Updating $APP" + cd /opt/glances + source .venv/bin/activate + uv pip install --upgrade "glances[web]" >/dev/null 2>&1 + deactivate + systemctl restart glances + msg_ok "Updated $APP" +} + +# uninstall on Debian/Ubuntu +uninstall_glances_debian() { + msg_info "Uninstalling $APP" + systemctl disable -q --now glances || true + rm -f /etc/systemd/system/glances.service + rm -rf /opt/glances + msg_ok "Removed $APP" +} + +# install on Alpine +install_glances_alpine() { + msg_info "Installing dependencies" + apk update >/dev/null 2>&1 + $STD apk add --no-cache \ + gcc musl-dev linux-headers python3-dev \ + python3 py3-pip py3-virtualenv lm-sensors wireless-tools >/dev/null 2>&1 + msg_ok "Installed dependencies" + + msg_info "Setting up Python + uv" + source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/tools.func) + setup_uv PYTHON_VERSION="3.12" + msg_ok "Setup Python + uv" + + msg_info "Installing $APP (with web UI)" + cd /opt + mkdir -p glances + cd glances + uv venv + source .venv/bin/activate + uv pip install --upgrade pip wheel setuptools >/dev/null 2>&1 + uv pip install "glances[web]" >/dev/null 2>&1 + deactivate + msg_ok "Installed $APP" + + msg_info "Creating OpenRC service" + cat <<'EOF' >/etc/init.d/glances +#!/sbin/openrc-run +command="/opt/glances/.venv/bin/glances" +command_args="-w" +command_background="yes" +pidfile="/run/glances.pid" +name="glances" +description="Glances monitoring tool" +EOF + chmod +x /etc/init.d/glances + rc-update add glances default + rc-service glances start + msg_ok "Created OpenRC service" + + echo -e "\n$APP is now running at: http://$IP:61208\n" +} + +# update on Alpine +update_glances_alpine() { + if [[ ! -d /opt/glances/.venv ]]; then + msg_error "$APP is not installed" + exit 1 + fi + msg_info "Updating $APP" + cd /opt/glances + source .venv/bin/activate + uv pip install --upgrade "glances[web]" >/dev/null 2>&1 + deactivate + rc-service glances restart + msg_ok "Updated $APP" +} + +# uninstall on Alpine +uninstall_glances_alpine() { + msg_info "Uninstalling $APP" + rc-service glances stop || true + rc-update del glances || true + rm -f /etc/init.d/glances + rm -rf /opt/glances + msg_ok "Removed $APP" +} + +# options menu +OPTIONS=(Install "Install $APP" + Update "Update $APP" + Uninstall "Uninstall $APP") + +CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "$APP" --menu "Select an option:" 12 58 3 \ + "${OPTIONS[@]}" 3>&1 1>&2 2>&3 || true) + +# OS detection +if grep -qi "alpine" /etc/os-release; then + case "$CHOICE" in + Install) install_glances_alpine ;; + Update) update_glances_alpine ;; + Uninstall) uninstall_glances_alpine ;; + *) exit 0 ;; + esac +else + case "$CHOICE" in + Install) install_glances_debian ;; + Update) update_glances_debian ;; + Uninstall) uninstall_glances_debian ;; + *) exit 0 ;; + esac +fi + + ________ + / ____/ /___ _____ ________ _____ + / / __/ / __ `/ __ \/ ___/ _ \/ ___/ +/ /_/ / / /_/ / / / / /__/ __(__ ) +\____/_/\__,_/_/ /_/\___/\___/____/ + +EOF +} + +APP="Glances" +YW=$(echo "\033[33m") +GN=$(echo "\033[1;92m") +RD=$(echo "\033[01;31m") +BL=$(echo "\033[36m") +CL=$(echo "\033[m") +CM="${GN}✔️${CL}" +CROSS="${RD}✖️${CL}" +INFO="${BL}ℹ️${CL}" + +function msg_info() { echo -e "${INFO} ${YW}$1...${CL}"; } +function msg_ok() { echo -e "${CM} ${GN}$1${CL}"; } +function msg_error() { echo -e "${CROSS} ${RD}$1${CL}"; } + +get_local_ip() { + if command -v hostname >/dev/null 2>&1 && hostname -I 2>/dev/null; then + hostname -I | awk '{print $1}' + elif command -v ip >/dev/null 2>&1; then + ip -4 addr show scope global | awk '/inet / {print $2}' | cut -d/ -f1 | head -n1 + else + echo "127.0.0.1" + fi +} +IP=$(get_local_ip) + install_glances_debian() { msg_info "Installing dependencies" apt-get update >/dev/null 2>&1 diff --git a/tools/pve/update-apps.sh b/tools/pve/update-apps.sh index c69af1e08..787fb7aac 100644 --- a/tools/pve/update-apps.sh +++ b/tools/pve/update-apps.sh @@ -4,7 +4,7 @@ # Author: BvdBerg01 | Co-Author: remz1337 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE -source <(curl -fsSL https://raw.githubusercontent.com/fstof/ProxmoxVED/refs/heads/donetick/misc/core.func) +source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/refs/heads/main/misc/core.func) function header_info { clear @@ -64,7 +64,8 @@ END { } header_info -msg_info "Loading all possible LXC containers from Proxmox VE. This may take a few seconds..." +echo "Loading all possible LXC containers from Proxmox VE" +echo "This may take a few seconds..." whiptail --backtitle "Proxmox VE Helper Scripts" --title "LXC Container Update" --yesno "This will update LXC container. Proceed?" 10 58 || exit NODE=$(hostname) @@ -88,7 +89,6 @@ while read -r container; do menu_items+=("$container_id" "$formatted_line" "OFF") fi done <<<"$containers" -msg_ok "Loaded ${#menu_items[@]} containers" CHOICE=$(whiptail --title "LXC Container Update" \ --checklist "Select LXC containers to update:" 25 60 13 \ @@ -168,7 +168,7 @@ for container in $CHOICE; do fi #2) Extract service build/update resource requirements from config/installation file - script=$(curl -fsSL https://raw.githubusercontent.com/fstof/ProxmoxVED/donetick/ct/${service}.sh) + script=$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/ct/${service}.sh) #2.1) Check if the script downloaded successfully if [ $? -ne 0 ]; then