Refactor: Blocky

Updated blocky.sh to improve update logic, including backup and restore of config, service management, and release fetching. Refactored blocky-install.sh to use fetch_and_deploy_gh_release for installation, removing manual release handling. Set Blocky as updateable in blocky.json.

ct/blocky.sh

@@ -3,7 +3,7 @@ source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxV
 # Copyright (c) 2021-2025 tteck
 # Author: tteck (tteckster)
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# Source: https://0xerr0r.github.io/blocky/latest/
+# Source: https://0xerr0r.github.io/blocky
 
 APP="Blocky"
 var_tags="${var_tags:-adblock}"
@@ -20,18 +20,38 @@ color
 catch_errors
 
 function update_script() {
-    header_info
+  header_info
-    check_container_storage
+  check_container_storage
-    check_container_resources
+  check_container_resources
-    if [[ ! -d /var ]]; then
+  if [[ ! -d /opt/blocky ]]; then
-        msg_error "No ${APP} Installation Found!"
+    msg_error "No ${APP} Installation Found!"
-        exit
-    fi
-    msg_info "Updating $APP LXC"
-    $STD apt-get update
-    $STD apt-get -y upgrade
-    msg_ok "Updated $APP LXC"
     exit
+  fi
+  if check_for_gh_release "blocky" "0xERR0R/blocky"; then
+    msg_info "Stopping Service"
+    systemctl stop blocky
+    msg_ok "Stopped Service"
+
+    msg_info "Backup Config"
+    mv /opt/blocky/config.yml /opt/config.yml
+    msg_ok "Backed Up Config"
+
+    msg_info "Removing Old Version"
+    rm -rf /opt/blocky
+    msg_ok "Removed Old Version"
+
+    fetch_and_deploy_gh_release "blocky" "0xERR0R/blocky" "prebuild" "latest" "/opt/blocky" "blocky_*_linux_x86_64.tar.gz"
+
+    msg_info "Restore Config"
+    mv /opt/config.yml /opt/blocky/config.yml
+    msg_ok "Restored Config"
+
+    msg_info "Starting Service"
+    systemctl start blocky
+    msg_ok "Started Service"
+    msg_ok "Updated Successfully"
+  fi
+  exit
 }
 
 start

frontend/public/json/blocky.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 4000,
   "documentation": "https://0xerr0r.github.io/blocky/latest/configuration/",

frontend/public/json/pialert.json

@@ -31,5 +31,10 @@
     "username": null,
     "password": null
   },
-  "notes": []
+  "notes": [
+    {
+      "text": "WARNING: Installation sources scripts outside of Community Scripts repo. Please check the source before installing.",
+      "type": "warning"
+    }
+  ]
 }

frontend/public/json/plex.json

@@ -35,6 +35,10 @@
     {
       "text": "With Privileged/Unprivileged Hardware Acceleration Support",
       "type": "info"
+    },
+    {
+      "text": "WARNING: Installation sources scripts outside of Community Scripts repo. Please check the source before installing.",
+      "type": "warning"
     }
   ]
 }

frontend/public/json/podman-homeassistant.json

@@ -1,48 +1,52 @@
 {
-  "name": "Podman Home Assistant Container",
+    "name": "Podman Home Assistant Container",
-  "slug": "podman-homeassistant",
+    "slug": "podman-homeassistant",
-  "categories": [
+    "categories": [
-    16
+        16
-  ],
+    ],
-  "date_created": "2024-04-29",
+    "date_created": "2024-04-29",
-  "type": "ct",
+    "type": "ct",
-  "updateable": true,
+    "updateable": true,
-  "privileged": false,
+    "privileged": false,
-  "interface_port": 8123,
+    "interface_port": 8123,
-  "documentation": "https://www.home-assistant.io/docs/",
+    "documentation": "https://www.home-assistant.io/docs/",
-  "website": "https://www.home-assistant.io/",
+    "website": "https://www.home-assistant.io/",
-  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/home-assistant.webp",
+    "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/home-assistant.webp",
-  "config_path": "/var/lib/containers/storage/volumes/hass_config/_data",
+    "config_path": "/var/lib/containers/storage/volumes/hass_config/_data",
-  "description": "A standalone Podman container-based installation of Home Assistant Core means that the Home Assistant Core software is installed inside a container managed by Podman, separate from the host operating system. This provides a flexible and scalable solution for running the software, as the container can be easily moved between host systems or isolated from other processes for security. Podman is a popular open-source tool for managing containers that is similar to Docker, but designed for use on Linux systems without a daemon.\r\n\r\n\ud83d\udec8 If the LXC is created Privileged, the script will automatically set up USB passthrough.",
+    "description": "A standalone Podman container-based installation of Home Assistant Core means that the Home Assistant Core software is installed inside a container managed by Podman, separate from the host operating system. This provides a flexible and scalable solution for running the software, as the container can be easily moved between host systems or isolated from other processes for security. Podman is a popular open-source tool for managing containers that is similar to Docker, but designed for use on Linux systems without a daemon.\r\n\r\n\ud83d\udec8 If the LXC is created Privileged, the script will automatically set up USB passthrough.",
-  "install_methods": [
+    "install_methods": [
-    {
+        {
-      "type": "default",
+            "type": "default",
-      "script": "ct/podman-homeassistant.sh",
+            "script": "ct/podman-homeassistant.sh",
-      "resources": {
+            "resources": {
-        "cpu": 2,
+                "cpu": 2,
-        "ram": 2048,
+                "ram": 2048,
-        "hdd": 16,
+                "hdd": 16,
-        "os": "debian",
+                "os": "debian",
-        "version": "12"
+                "version": "12"
-      }
+            }
-    }
+        }
-  ],
+    ],
-  "default_credentials": {
+    "default_credentials": {
-    "username": null,
+        "username": null,
-    "password": null
+        "password": null
-  },
-  "notes": [
-    {
-      "text": "If the LXC is created Privileged, the script will automatically set up USB passthrough.",
-      "type": "warning"
     },
-    {
+    "notes": [
-      "text": "config path: `/var/lib/containers/storage/volumes/hass_config/_data`",
+        {
-      "type": "info"
+            "text": "If the LXC is created Privileged, the script will automatically set up USB passthrough.",
-    },
+            "type": "warning"
-    {
+        },
-      "text": "Options to Install Portainer or Portainer Agent",
+        {
-      "type": "warning"
+            "text": "config path: `/var/lib/containers/storage/volumes/hass_config/_data`",
-    }
+            "type": "info"
-  ]
+        },
+        {
+            "text": "Options to Install Portainer or Portainer Agent",
+            "type": "warning"
+        },
+        {
+            "text": "WARNING: Installation sources scripts outside of Community Scripts repo. Please check the source before installing.",
+            "type": "warning"
+        }
+    ]
 }

install/blocky-install.sh

@@ -3,7 +3,7 @@
 # Copyright (c) 2021-2025 tteck
 # Author: tteck (tteckster)
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# Source: https://0xerr0r.github.io/blocky/latest/
+# Source: https://0xerr0r.github.io/blocky
 
 source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
 color
@@ -13,14 +13,12 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing Blocky"
+fetch_and_deploy_gh_release "blocky" "0xERR0R/blocky" "prebuild" "latest" "/opt/blocky" "blocky_*_linux_x86_64.tar.gz"
+
+msg_info "Configuring Blocky"
 if systemctl is-active systemd-resolved >/dev/null 2>&1; then
   systemctl disable -q --now systemd-resolved
 fi
-mkdir /opt/blocky
-RELEASE=$(curl -fsSL https://api.github.com/repos/0xERR0R/blocky/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-curl -fsSL "https://github.com/0xERR0R/blocky/releases/download/v${RELEASE}/blocky_v${RELEASE}_Linux_x86_64.tar.gz" | tar -xzf - -C /opt/blocky/
-
 cat <<EOF >/opt/blocky/config.yml
 # configuration documentation: https://0xerr0r.github.io/blocky/latest/configuration/
 
@@ -63,7 +61,7 @@ log:
   # optional: Log level (one from trace, debug, info, warn, error). Default: info
   level: info
 EOF
-msg_ok "Installed Blocky"
+msg_ok "Configured Blocky"
 
 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/blocky.service
@@ -77,7 +75,7 @@ ExecStart=/opt/blocky/./blocky --config config.yml
 [Install]
 WantedBy=multi-user.target
 EOF
-$STD systemctl enable --now blocky
+$STD systemctl enable -q --now blocky
 msg_ok "Created Service"
 
 motd_ssh

install/bunkerweb-install.sh

@@ -19,17 +19,7 @@ $STD apt-get install -y lsb-release
 msg_ok "Installed Dependencies"
 
 RELEASE=$(curl -fsSL https://api.github.com/repos/bunkerity/bunkerweb/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-msg_warn "WARNING: This script will run an external installer from a third-party source (install-bunkerweb.sh)."
+msg_info "Installing BunkerWeb v${RELEASE} (Patience)"
-msg_warn "The following code is NOT maintained or audited by our repository."
-msg_warn "If you have any doubts or concerns, please review the installer code before proceeding:"
-msg_custom "${TAB3}${GATEWAY}${BGN}${CL}" "\e[1;34m" "→  https://github.com/bunkerity/bunkerweb/raw/v${RELEASE}/misc/install-bunkerweb.sh"
-echo
-read -r -p "${TAB3}Do you want to continue? [y/N]: " CONFIRM
-if [[ ! "$CONFIRM" =~ ^([yY][eE][sS]|[yY])$ ]]; then
-  msg_error "Aborted by user. No changes have been made."
-  exit 10
-fi
-msg_info "Installing BunkerWeb (Patience)"
 curl -fsSL -o install-bunkerweb.sh https://github.com/bunkerity/bunkerweb/raw/v${RELEASE}/misc/install-bunkerweb.sh
 chmod +x install-bunkerweb.sh
 $STD ./install-bunkerweb.sh --yes

install/casaos-install.sh

@@ -13,16 +13,6 @@ setting_up_container
 network_check
 update_os
 
-msg_warn "WARNING: This script will run an external installer from a third-party source (https://casaos.zimaspace.com/)."
-msg_warn "The following code is NOT maintained or audited by our repository."
-msg_warn "If you have any doubts or concerns, please review the installer code before proceeding:"
-msg_custom "${TAB3}${GATEWAY}${BGN}${CL}" "\e[1;34m" "→  https://get.casaos.io/"
-echo
-read -r -p "${TAB3}Do you want to continue? [y/N]: " CONFIRM
-if [[ ! "$CONFIRM" =~ ^([yY][eE][sS]|[yY])$ ]]; then
-  msg_error "Aborted by user. No changes have been made."
-  exit 10
-fi
 msg_info "Installing CasaOS (Patience)"
 DOCKER_CONFIG_PATH='/etc/docker/daemon.json'
 mkdir -p $(dirname $DOCKER_CONFIG_PATH)

install/channels-install.sh

@@ -18,17 +18,6 @@ $STD apt-get install -y chromium
 $STD apt-get install -y xvfb
 msg_ok "Installed Dependencies"
 
-msg_warn "WARNING: This script will run an external installer from a third-party source (https://getchannels.com)."
-msg_warn "The following code is NOT maintained or audited by our repository."
-msg_warn "If you have any doubts or concerns, please review the installer code before proceeding:"
-msg_custom "${TAB3}${GATEWAY}${BGN}${CL}" "\e[1;34m" "→  https://getchannels.com/dvr/setup.sh"
-echo
-read -r -p "${TAB3}Do you want to continue? [y/N]: " CONFIRM
-if [[ ! "$CONFIRM" =~ ^([yY][eE][sS]|[yY])$ ]]; then
-  msg_error "Aborted by user. No changes have been made."
-  exit 10
-fi
-
 if [[ "$CTTYPE" == "0" ]]; then
   msg_info "Setting Up Hardware Acceleration"
   $STD apt-get -y install \

install/iobroker-install.sh

@@ -17,17 +17,6 @@ msg_info "Installing Dependencies"
 $STD apt-get install -y ca-certificates
 msg_ok "Installed Dependencies"
 
-msg_warn "WARNING: This script will run an external installer from a third-party source (https://iobroker.net/)."
-msg_warn "The following code is NOT maintained or audited by our repository."
-msg_warn "If you have any doubts or concerns, please review the installer code before proceeding:"
-msg_custom "${TAB3}${GATEWAY}${BGN}${CL}" "\e[1;34m" "→  https://iobroker.net/install.sh"
-echo
-read -r -p "${TAB3}Do you want to continue? [y/N]: " CONFIRM
-if [[ ! "$CONFIRM" =~ ^([yY][eE][sS]|[yY])$ ]]; then
-  msg_error "Aborted by user. No changes have been made."
-  exit 10
-fi
-
 NODE_VERSION="22" setup_nodejs
 
 msg_info "Installing ioBroker (Patience)"

install/jeedom-install.sh

@@ -19,17 +19,6 @@ $STD apt-get install -y \
   git
 msg_ok "Dependencies installed"
 
-msg_warn "WARNING: This script will run an external installer from a third-party source (https://github.com/jeedom/)."
-msg_warn "The following code is NOT maintained or audited by our repository."
-msg_warn "If you have any doubts or concerns, please review the installer code before proceeding:"
-msg_custom "${TAB3}${GATEWAY}${BGN}${CL}" "\e[1;34m" "→  https://raw.githubusercontent.com/jeedom/core/master/install/install.sh"
-echo
-read -r -p "${TAB3}Do you want to continue? [y/N]: " CONFIRM
-if [[ ! "$CONFIRM" =~ ^([yY][eE][sS]|[yY])$ ]]; then
-  msg_error "Aborted by user. No changes have been made."
-  exit 10
-fi
-
 DEFAULT_BRANCH="master"
 REPO_URL="https://github.com/jeedom/core.git"
 

install/kasm-install.sh

@@ -13,32 +13,20 @@ setting_up_container
 network_check
 update_os
 
-KASM_VERSION=$(curl -fsSL 'https://www.kasmweb.com/downloads' | grep -o 'https://kasm-static-content.s3.amazonaws.com/kasm_release_[^"]*\.tar\.gz' | head -n 1 | sed -E 's/.*release_(.*)\.tar\.gz/\1/')
-
-msg_warn "WARNING: This script will run an external installer from a third-party source (https://www.kasmweb.com/)."
-msg_warn "The following code is NOT maintained or audited by our repository."
-msg_warn "If you have any doubts or concerns, please review the installer code before proceeding:"
-msg_custom "${TAB3}${GATEWAY}${BGN}${CL}" "\e[1;34m" "→  install.sh inside tar.gz https://kasm-static-content.s3.amazonaws.com/kasm_release_${KASM_VERSION}.tar.gz"
-echo
-read -r -p "${TAB3}Do you want to continue? [y/N]: " CONFIRM
-if [[ ! "$CONFIRM" =~ ^([yY][eE][sS]|[yY])$ ]]; then
-  msg_error "Aborted by user. No changes have been made."
-  exit 10
-fi
-
 msg_info "Installing Kasm Workspaces"
+KASM_VERSION=$(curl -fsSL 'https://www.kasmweb.com/downloads' | grep -o 'https://kasm-static-content.s3.amazonaws.com/kasm_release_[^"]*\.tar\.gz' | head -n 1 | sed -E 's/.*release_(.*)\.tar\.gz/\1/')
 curl -fsSL -o "/opt/kasm_release_${KASM_VERSION}.tar.gz" "https://kasm-static-content.s3.amazonaws.com/kasm_release_${KASM_VERSION}.tar.gz"
 cd /opt
 tar -xf "kasm_release_${KASM_VERSION}.tar.gz"
 chmod +x /opt/kasm_release/install.sh
-printf 'y\ny\ny\n4\n' | bash /opt/kasm_release/install.sh >~/kasm-install.output 2>&1
+printf 'y\ny\ny\n4\n' | bash /opt/kasm_release/install.sh > ~/kasm-install.output 2>&1
 awk '
   /^Kasm UI Login Credentials$/ {capture=1}
   capture {print}
   /^Service Registration Token$/ {in_token=1}
   in_token && /^-+$/ {dash_count++}
   in_token && dash_count==2 {exit}
-' ~/kasm-install.output >~/kasm.creds
+' ~/kasm-install.output > ~/kasm.creds
 msg_ok "Installed Kasm Workspaces"
 
 motd_ssh

install/mattermost-install.sh

@@ -13,17 +13,6 @@ setting_up_container
 network_check
 update_os
 
-msg_warn "WARNING: This script will run an external installer from a third-party source (https://mattermost.com/)."
-msg_warn "The following code is NOT maintained or audited by our repository."
-msg_warn "If you have any doubts or concerns, please review the installer code before proceeding:"
-msg_custom "${TAB3}${GATEWAY}${BGN}${CL}" "\e[1;34m" "→  https://deb.packages.mattermost.com/repo-setup.sh"
-echo
-read -r -p "${TAB3}Do you want to continue? [y/N]: " CONFIRM
-if [[ ! "$CONFIRM" =~ ^([yY][eE][sS]|[yY])$ ]]; then
-  msg_error "Aborted by user. No changes have been made."
-  exit 10
-fi
-
 PG_VERSION="16" setup_postgresql
 
 msg_info "Setting up PostgreSQL"

install/nextcloudpi-install.sh

@@ -3,7 +3,7 @@
 # Copyright (c) 2021-2025 tteck
 # Author: tteck (tteckster)
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# Source: https://nextcloudpi.com/
+# Source: https://www.turnkeylinux.org/nextcloud
 
 source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
 color
@@ -13,19 +13,8 @@ setting_up_container
 network_check
 update_os
 
-msg_warn "WARNING: This script will run an external installer from a third-party source (https://nextcloudpi.com/)."
-msg_warn "The following code is NOT maintained or audited by our repository."
-msg_warn "If you have any doubts or concerns, please review the installer code before proceeding:"
-msg_custom "${TAB3}${GATEWAY}${BGN}${CL}" "\e[1;34m" "→  https://raw.githubusercontent.com/nextcloud/nextcloudpi/master/install.sh"
-echo
-read -r -p "${TAB3}Do you want to continue? [y/N]: " CONFIRM
-if [[ ! "$CONFIRM" =~ ^([yY][eE][sS]|[yY])$ ]]; then
-  msg_error "Aborted by user. No changes have been made."
-  exit 10
-fi
-
 msg_info "Installing NextCloudPi (Patience)"
-$STD bash <(curl -fsSL https://raw.githubusercontent.com/nextcloud/nextcloudpi/master/install.sh)
+bash <(curl -fsSL https://raw.githubusercontent.com/nextcloud/nextcloudpi/master/install.sh) >/dev/null 2>&1
 msg_ok "Installed NextCloudPi"
 
 motd_ssh

install/pihole-install.sh

@@ -13,17 +13,6 @@ setting_up_container
 network_check
 update_os
 
-msg_warn "WARNING: This script will run an external installer from a third-party source (https://pi-hole.net/)."
-msg_warn "The following code is NOT maintained or audited by our repository."
-msg_warn "If you have any doubts or concerns, please review the installer code before proceeding:"
-msg_custom "${TAB3}${GATEWAY}${BGN}${CL}" "\e[1;34m" "→  https://install.pi-hole.net"
-echo
-read -r -p "${TAB3}Do you want to continue? [y/N]: " CONFIRM
-if [[ ! "$CONFIRM" =~ ^([yY][eE][sS]|[yY])$ ]]; then
-  msg_error "Aborted by user. No changes have been made."
-  exit 10
-fi
-
 msg_info "Installing Dependencies"
 $STD apt-get install -y ufw
 msg_ok "Installed Dependencies"

install/runtipi-install.sh

@@ -13,17 +13,6 @@ setting_up_container
 network_check
 update_os
 
-msg_warn "WARNING: This script will run an external installer from a third-party source (https://runtipi.io/)."
-msg_warn "The following code is NOT maintained or audited by our repository."
-msg_warn "If you have any doubts or concerns, please review the installer code before proceeding:"
-msg_custom "${TAB3}${GATEWAY}${BGN}${CL}" "\e[1;34m" "→  https://raw.githubusercontent.com/runtipi/runtipi/master/scripts/install.sh"
-echo
-read -r -p "${TAB3}Do you want to continue? [y/N]: " CONFIRM
-if [[ ! "$CONFIRM" =~ ^([yY][eE][sS]|[yY])$ ]]; then
-  msg_error "Aborted by user. No changes have been made."
-  exit 10
-fi
-
 msg_info "Installing Runtipi (Patience)"
 DOCKER_CONFIG_PATH='/etc/docker/daemon.json'
 mkdir -p "$(dirname "$DOCKER_CONFIG_PATH")"

install/wazuh-install.sh

@@ -13,18 +13,9 @@ setting_up_container
 network_check
 update_os
 
+msg_info "Fetching Latest Wazuh Version"
 RELEASE=$(curl -fsSL https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '"tag_name"' | awk -F '"' '{print substr($4, 2, length($2)-4)}')
-
+msg_ok "Latest Wazuh Version: $RELEASE"
-msg_warn "WARNING: This script will run an external installer from a third-party source (https://wazuh.com/)."
-msg_warn "The following code is NOT maintained or audited by our repository."
-msg_warn "If you have any doubts or concerns, please review the installer code before proceeding:"
-msg_custom "${TAB3}${GATEWAY}${BGN}${CL}" "\e[1;34m" "→  https://packages.wazuh.com/$RELEASE/wazuh-install.sh "
-echo
-read -r -p "${TAB3}Do you want to continue? [y/N]: " CONFIRM
-if [[ ! "$CONFIRM" =~ ^([yY][eE][sS]|[yY])$ ]]; then
-  msg_error "Aborted by user. No changes have been made."
-  exit 10
-fi
 
 msg_info "Setup Wazuh"
 curl -fsSL https://packages.wazuh.com/$RELEASE/wazuh-install.sh -o wazuh-install.sh

install/yunohost-install.sh

@@ -14,23 +14,11 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y \
+$STD apt-get install -y apt-transport-https
-  apt-transport-https \
+$STD apt-get install -y lsb-release
-  lsb-release \
+$STD apt-get install -y ca-certificates
-  ca-certificates
 msg_ok "Installed Dependencies"
 
-msg_warn "WARNING: This script will run an external installer from a third-party source (https://yunohost.org/)."
-msg_warn "The following code is NOT maintained or audited by our repository."
-msg_warn "If you have any doubts or concerns, please review the installer code before proceeding:"
-msg_custom "${TAB3}${GATEWAY}${BGN}${CL}" "\e[1;34m" "→  https://install.yunohost.org"
-echo
-read -r -p "${TAB3}Do you want to continue? [y/N]: " CONFIRM
-if [[ ! "$CONFIRM" =~ ^([yY][eE][sS]|[yY])$ ]]; then
-  msg_error "Aborted by user. No changes have been made."
-  exit 10
-fi
-
 msg_info "Installing YunoHost (Patience)"
 touch /etc/.pve-ignore.resolv.conf
 curl -fsSLo /usr/share/keyrings/deb.sury.org-php.gpg https://packages.sury.org/php/apt.gpg