Update 5etools

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

CHANGELOG.md

@@ -16,6 +16,18 @@ All LXC instances created using this repository come pre-installed with Midnight
 > [!IMPORTANT]
 Do not break established syntax in this file, as it is automatically updated by a Github Workflow
 
+## 2025-01-05
+
+### Changed
+
+### 💥 Breaking Changes
+
+- [Breaking] Update Zigbee2mqtt to v.2.0.0 (Read PR Description) [@MickLesk](https://github.com/MickLesk) ([#1221](https://github.com/community-scripts/ProxmoxVE/pull/1221))
+
+### ❔ Unlabelled
+
+- Add RAM and Disk units [@oOStroudyOo](https://github.com/oOStroudyOo) ([#1261](https://github.com/community-scripts/ProxmoxVE/pull/1261))
+
 ## 2025-01-04
 
 ### Changed

ct/5etools.sh

@@ -57,14 +57,12 @@ function update_script() {
         $STD npm run build
         cd ~
         echo "${RELEASE}" >"/opt/${APP}_version.txt"
-        msg_ok "Updated base 5etools"
-
         chown -R www-data: "/opt/${APP}"
         chmod -R 755 "/opt/${APP}"
-
+        msg_ok "Updated base 5etools"
         # Cleaning up
         msg_info "Cleaning Up"
-        rm "${RELEASE}.zip"
+        rm -rf /opt/${RELEASE}.zip
         $STD apt-get -y autoremove
         $STD apt-get -y autoclean
         msg_ok "Cleanup Completed"
@@ -87,11 +85,11 @@ function update_script() {
         rm -rf "/opt/${APP}/img"
         mv "${APP}-img-${IMG_RELEASE:1}" "/opt/${APP}/img"
         echo "${IMG_RELEASE}" >"/opt/${APP}_IMG_version.txt"
-        msg_ok "Updating 5etools images"
-
         chown -R www-data: "/opt/${APP}"
         chmod -R 755 "/opt/${APP}"
 
+        msg_ok "Updating 5etools images"
+
         # Cleaning up
         msg_info "Cleaning Up"
         rm -rf /opt/${RELEASE}.zip

install/5etools-install.sh

@@ -38,6 +38,7 @@ msg_ok "Installed Node.js"
 
 # Setup App
 msg_info "Set up 5etools Base"
+cd /opt
 RELEASE=$(curl -s https://api.github.com/repos/5etools-mirror-3/5etools-src/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
 wget -q "https://github.com/5etools-mirror-3/5etools-src/archive/refs/tags/${RELEASE}.zip"
 unzip -q "${RELEASE}.zip"
@@ -45,18 +46,16 @@ mv "5etools-src-${RELEASE:1}" /opt/5etools
 cd /opt/5etools
 $STD npm install
 $STD npm run build
-cd ~
 echo "${RELEASE}" >"/opt/5etools_version.txt"
-rm "${RELEASE}.zip"
 msg_ok "Set up 5etools Base"
 
 msg_info "Set up 5etools Image"
+cd /opt
 IMG_RELEASE=$(curl -s https://api.github.com/repos/5etools-mirror-2/5etools-img/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
 curl -sSL "https://github.com/5etools-mirror-2/5etools-img/archive/refs/tags/${IMG_RELEASE}.zip" > "${IMG_RELEASE}.zip"
 unzip -q "${IMG_RELEASE}.zip"
 mv "5etools-img-${IMG_RELEASE:1}" /opt/5etools/img
 echo "${IMG_RELEASE}" >"/opt/5etools_IMG_version.txt"
-rm "${IMG_RELEASE}.zip"
 msg_ok "Set up 5etools Image"
 
 msg_info "Creating Service"
@@ -74,6 +73,8 @@ chmod -R 755 "/opt/5etools"
 msg_ok "Created Service"
 
 msg_info "Cleaning up"
+rm -rf /opt/${IMG_RELEASE}.zip
+rm -rf /opt/${RELEASE}.zip
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"

install/zigbee2mqtt-install.sh

@@ -43,7 +43,6 @@ msg_ok "Installed pnpm"
 
 msg_info "Setting up Zigbee2MQTT"
 cd /opt
-$STD corepack enable
 RELEASE=$(curl -s https://api.github.com/repos/Koenkk/zigbee2mqtt/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
 wget -q "https://github.com/Koenkk/zigbee2mqtt/archive/refs/tags/${RELEASE}.zip"
 unzip -q ${RELEASE}.zip
@@ -57,7 +56,7 @@ msg_ok "Installed Zigbee2MQTT"
 
 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/zigbee2mqtt.service
-echo "[Unit]
+[Unit]
 Description=zigbee2mqtt
 After=network.target
 [Service]
@@ -69,6 +68,7 @@ StandardError=inherit
 Restart=always
 User=root
 [Install]
+WantedBy=multi-user.target
 EOF
 systemctl enable -q --now zigbee2mqtt.service
 msg_ok "Created Service"

misc/build.func

@@ -316,7 +316,7 @@ echo_default() {
   echo -e "${CONTAINERTYPE}${BOLD}${DGN}Container Type: ${BGN}$CT_TYPE_DESC${CL}"
   echo -e "${DISKSIZE}${BOLD}${DGN}Disk Size: ${BGN}${DISK_SIZE}GB${CL}"
   echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}${CORE_COUNT}${CL}"
-  echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}${RAM_SIZE}MB${CL}"
+  echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}${RAM_SIZE}MiB${CL}"
   echo -e "${CONTAINERID}${BOLD}${DGN}Container ID: ${BGN}${CT_ID}${CL}"
   if [ "$VERB" == "yes" ]; then
     echo -e "${SEARCH}${BOLD}${DGN}Verbose Mode: ${BGN}Enabled${CL}"
@@ -463,13 +463,13 @@ advanced_settings() {
   if DISK_SIZE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Disk Size in GB" 8 58 $var_disk --title "DISK SIZE" 3>&1 1>&2 2>&3); then
     if [ -z "$DISK_SIZE" ]; then
       DISK_SIZE="$var_disk"
-      echo -e "${DISKSIZE}${DGN}Disk Size: ${BGN}$DISK_SIZE${CL}"
+      echo -e "${DISKSIZE}${BOLD}${DGN}Disk Size: ${BGN}${DISK_SIZE}GB${CL}"
     else
       if ! [[ $DISK_SIZE =~ $INTEGER ]]; then
         echo -e "{INFO}${HOLD}${RD} DISK SIZE MUST BE AN INTEGER NUMBER!${CL}"
         advanced_settings
       fi
-      echo -e "${DISKSIZE}${BOLD}${DGN}Disk Size: ${BGN}$DISK_SIZE${CL}"
+      echo -e "${DISKSIZE}${BOLD}${DGN}Disk Size: ${BGN}${DISK_SIZE}GB${CL}"
     fi
   else
     exit_script
@@ -489,9 +489,9 @@ advanced_settings() {
   if RAM_SIZE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Allocate RAM in MiB" 8 58 $var_ram --title "RAM" 3>&1 1>&2 2>&3); then
     if [ -z "$RAM_SIZE" ]; then
       RAM_SIZE="$var_ram"
-      echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}$RAM_SIZE${CL}"
+      echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}${RAM_SIZE}MiB${CL}"
     else
-      echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}$RAM_SIZE${CL}"
+      echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}${RAM_SIZE}MiB${CL}"
     fi
   else
     exit_script