Update 5etools

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

.github/workflows/check-lowercase.yml

@@ -0,0 +1,92 @@
+name: Check Lowercase Filenames
+
+on:
+  pull_request:
+    paths:
+      - 'ct/*.sh'
+      - 'install/*.sh'
+      - 'json/*.json'
+
+jobs:
+  check_lowercase:
+    runs-on: ubuntu-latest
+
+    steps:
+      # Step 1: Checkout the code
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Ensure the full history is fetched for accurate diffing
+
+      # Step 2: Fetch the base branch
+      - name: Fetch base branch
+        run: git fetch origin ${{ github.base_ref }}
+
+      # Step 3a: Validate filenames in ct directory
+      - name: "Validate filenames in ct directory"
+        run: |
+          changed_files=$(git diff --name-only origin/${{ github.base_ref }}...HEAD | grep -E '^ct/.*\.sh$')
+
+          ERROR_COUNT=0
+
+          for FILE in $changed_files; do
+              BASENAME=$(basename "$FILE")
+              if [[ "$BASENAME" =~ ^[a-z0-9._-]+$ ]]; then
+                  echo "$FILE: Check for lowercase in filename passed."
+              else
+                  echo "Error in $FILE. Change filename to lowercase."
+                  ERROR_COUNT=$((ERROR_COUNT + 1))
+              fi
+          done
+
+          if [ "$ERROR_COUNT" -ne 0 ]; then
+              exit 1
+          else
+              echo "All filenames in ct directory passed the lowercase check."
+          fi
+
+      # Step 3b: Validate filenames in install directory
+      - name: "Validate filenames in install directory"
+        run: |
+          changed_files=$(git diff --name-only origin/${{ github.base_ref }}...HEAD | grep -E '^install/.*\.sh$')
+
+          ERROR_COUNT=0
+
+          for FILE in $changed_files; do
+              BASENAME=$(basename "$FILE")
+              if [[ "$BASENAME" =~ ^[a-z0-9._-]+$ ]]; then
+                  echo "$FILE: Check for lowercase in filename passed."
+              else
+                  echo "Error in $FILE. Change filename to lowercase."
+                  ERROR_COUNT=$((ERROR_COUNT + 1))
+              fi
+          done
+
+          if [ "$ERROR_COUNT" -ne 0 ]; then
+              exit 1
+          else
+              echo "All filenames in install directory passed the lowercase check."
+          fi
+
+      # Step 3c: Validate filenames in json directory
+      - name: "Validate filenames in json directory."
+        run: |
+          changed_files=$(git diff --name-only origin/${{ github.base_ref }}...HEAD | grep -E '^json/.*\.json$')
+
+          ERROR_COUNT=0
+
+          for FILE in $changed_files; do
+              BASENAME=$(basename "$FILE")
+              if [[ "$BASENAME" =~ ^[a-z0-9._-]+$ ]]; then
+                  echo "$FILE: Check for lowercase in filename passed."
+              else
+                  echo "Error in $FILE. Change filename to lowercase."
+                  ERROR_COUNT=$((ERROR_COUNT + 1))
+              fi
+          done
+
+          if [ "$ERROR_COUNT" -ne 0 ]; then
+              exit 1
+          else
+              echo "All filenames in json directory passed the lowercase check."
+          fi

.github/workflows/check-metadata.yml

@@ -0,0 +1,55 @@
+name: Check Metadata
+on:
+  pull_request:
+    paths:
+      - '/ct/*.sh'
+      - '/install/*.sh'
+jobs:
+  check-metadata:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+      - name: Check Metadata Lines in Scripts
+        shell: bash
+        run: |
+          set -e
+          ERROR_COUNT=0
+          FILES=$(find . -name "*.sh")
+
+          for FILE in $FILES; do
+            if [[ "$(sed -n '3p' "$FILE")" == "# Copyright (c) 2021-2024 community-scripts ORG" ]]; then
+                echo "Check for Copyright metadata passed for line 3 in: $FILE"
+            else
+                echo "Error in $FILE: Copyright metadata missing or not on line 3"
+                ERROR_COUNT=$((ERROR_COUNT + 1))
+            fi
+            
+            if sed -n '4p' "$FILE" | grep -qE "^# Author: .+"; then
+                echo "Check for Author metadata passed for line 4 in: $FILE"
+            else
+                echo "Error in $FILE: Author metadata missing or invalid on line 4"
+                ERROR_COUNT=$((ERROR_COUNT + 1))
+            fi
+
+            if [[ "$(sed -n '5p' "$FILE")" == "# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE" ]]; then
+                echo "Check for License metadata passed for line 5 in: $FILE"
+            else
+                echo "Error in $FILE: License metadata missing or not on line 5"
+                ERROR_COUNT=$((ERROR_COUNT + 1))
+            fi
+
+            if sed -n '6p' "$FILE" | grep -qE "^# Source: .+"; then
+                echo "Check for Source metadata passed for line 6 in: $FILE"
+            else
+                echo "Error in $FILE: Source metadata missing or invalid on line 6"
+                ERROR_COUNT=$((ERROR_COUNT + 1))
+            fi
+          done
+
+          if [[ "$ERROR_COUNT" -gt 0 ]]; then
+              echo "$ERROR_COUNT script(s) failed validation."
+              exit 1
+          else
+              echo "All scripts passed."
+          fi

CHANGELOG.md

@@ -16,6 +16,59 @@ 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
+
+### 🚀 Updated Scripts
+
+- Fix gpg key pf2tools & 5etools [@MickLesk](https://github.com/MickLesk) ([#1242](https://github.com/community-scripts/ProxmoxVE/pull/1242))
+- Homarr: Fix missing curl dependency [@MickLesk](https://github.com/MickLesk) ([#1238](https://github.com/community-scripts/ProxmoxVE/pull/1238))
+- Homeassistan Core: Fix Python3 and add missing dependencies [@MickLesk](https://github.com/MickLesk) ([#1236](https://github.com/community-scripts/ProxmoxVE/pull/1236))
+- Fix: Update Python for HomeAssistant [@MickLesk](https://github.com/MickLesk) ([#1227](https://github.com/community-scripts/ProxmoxVE/pull/1227))
+- OneDev: Add git-lfs [@MickLesk](https://github.com/MickLesk) ([#1225](https://github.com/community-scripts/ProxmoxVE/pull/1225))
+- Pf2eTools & 5eTools: Fixing npm build [@TheRealVira](https://github.com/TheRealVira) ([#1213](https://github.com/community-scripts/ProxmoxVE/pull/1213))
+
+### 🌐 Website
+
+- Bump next from 15.0.2 to 15.1.3 in /frontend [@dependabot[bot]](https://github.com/dependabot[bot]) ([#1212](https://github.com/community-scripts/ProxmoxVE/pull/1212))
+
+### 🧰 Maintenance
+
+- [GitHub Action] Add filename case check [@quantumryuu](https://github.com/quantumryuu) ([#1228](https://github.com/community-scripts/ProxmoxVE/pull/1228))
+
+## 2025-01-03
+
+### Changed
+
+### 🚀 Updated Scripts
+
+- Improve Homarr Installation [@MickLesk](https://github.com/MickLesk) ([#1208](https://github.com/community-scripts/ProxmoxVE/pull/1208))
+- Fix: Zabbix-Update Script [@MickLesk](https://github.com/MickLesk) ([#1205](https://github.com/community-scripts/ProxmoxVE/pull/1205))
+- Update Script: Lazylibrarian [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#1190](https://github.com/community-scripts/ProxmoxVE/pull/1190))
+- Fix: Memos update function [@MickLesk](https://github.com/MickLesk) ([#1207](https://github.com/community-scripts/ProxmoxVE/pull/1207))
+- Keep Lubelogger data after update to a new version [@JcMinarro](https://github.com/JcMinarro) ([#1200](https://github.com/community-scripts/ProxmoxVE/pull/1200))
+
+### 🌐 Website
+
+- Update Nextcloud-LXC JSON [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#1191](https://github.com/community-scripts/ProxmoxVE/pull/1191))
+
+### 🧰 Maintenance
+
+- Github action to check metadata lines in scripts. [@quantumryuu](https://github.com/quantumryuu) ([#1110](https://github.com/community-scripts/ProxmoxVE/pull/1110))
+
 ## 2025-01-02
 
 ### Changed

ct/5etools.sh

@@ -45,21 +45,24 @@ function update_script() {
 
         # Execute Update
         msg_info "Updating base 5etools"
+        cd /opt
         wget -q "https://github.com/5etools-mirror-3/5etools-src/archive/refs/tags/${RELEASE}.zip"
         unzip -q "${RELEASE}.zip"
         mv "/opt/${APP}/img" "/opt/img-backup"
         rm -rf "/opt/${APP}"
         mv "${APP}-src-${RELEASE:1}" "/opt/${APP}"
         mv "/opt/img-backup" "/opt/${APP}/img"
+        cd /opt/5etools
+        $STD npm install
+        $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"
@@ -82,14 +85,15 @@ 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 "${IMG_RELEASE}.zip"
+        rm -rf /opt/${RELEASE}.zip
+        rm -rf ${IMG_RELEASE}.zip
         $STD apt-get -y autoremove
         $STD apt-get -y autoclean
         msg_ok "Cleanup Completed"

ct/homeassistant-core.sh

@@ -51,7 +51,9 @@ function update_script() {
       echo -e "${GN}Updating to Stable Version${CL}"
       BR=""
     fi
-    if [[ "$PY" == "python3.11" ]]; then echo -e "⚠️  Home Assistant will soon require Python 3.12."; fi
+    if [[ "$PY" =~ ^python3\.(11|12)\.[0-9]+$ ]]; then
+    echo -e "⚠️  Home Assistant will soon require Python 3.13.x";
+    fi
 
     msg_info "Stopping Home Assistant"
     systemctl stop homeassistant

ct/lubelogger.sh

@@ -42,11 +42,19 @@ function update_script() {
     msg_info "Updating ${APP} to v${RELEASE}"
     cd /opt
     wget -q https://github.com/hargata/lubelog/releases/download/v${RELEASE}/LubeLogger_v${RELEASE_TRIMMED}_linux_x64.zip
-    cp /opt/lubelogger/appsettings.json /opt/appsettings.json
+    mkdir -p /tmp/lubeloggerData/wwwroot
+    cp /opt/lubelogger/appsettings.json /tmp/lubeloggerData/appsettings.json
+    cp -r /opt/lubelogger/config /tmp/lubeloggerData/
+    cp -r /opt/lubelogger/data /tmp/lubeloggerData/
+    [[ -e /opt/lubelogger/wwwroot/translations ]] && cp -r /opt/lubelogger/wwwroot/translations /tmp/lubeloggerData/wwwroot/
+    [[ -e /opt/lubelogger/wwwroot/documents ]] && cp -r /opt/lubelogger/wwwroot/documents /tmp/lubeloggerData/wwwroot/
+    [[ -e /opt/lubelogger/wwwroot/images ]] && cp -r /opt/lubelogger/wwwroot/images /tmp/lubeloggerData/wwwroot/
+    [[ -e /opt/lubelogger/wwwroot/temp ]] && cp -r /opt/lubelogger/wwwroot/temp /tmp/lubeloggerData/wwwroot/
+    [[ -e /opt/lubelogger/log ]] && cp -r /opt/lubelogger/log /tmp/lubeloggerData/
     rm -rf /opt/lubelogger
     unzip -qq LubeLogger_v${RELEASE_TRIMMED}_linux_x64.zip -d lubelogger
     chmod 700 /opt/lubelogger/CarCareTracker
-    mv -f /opt/appsettings.json /opt/lubelogger/appsettings.json
+    cp -rf /tmp/lubeloggerData/* /opt/lubelogger/
     echo "${RELEASE}" >"/opt/${APP}_version.txt"
     msg_ok "Updated ${APP} to v${RELEASE}"
 
@@ -56,6 +64,7 @@ function update_script() {
 
     msg_info "Cleaning up"
     rm -rf /opt/LubeLogger_v${RELEASE_TRIMMED}_linux_x64.zip
+    rm -rf /tmp/lubeloggerData
     msg_ok "Cleaned"
     msg_ok "Updated Successfully"
   else
@@ -71,4 +80,4 @@ description
 msg_ok "Completed Successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
 echo -e "${INFO}${YW} Access it using the following URL:${CL}"
-echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:5000${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:5000${CL}"

ct/memos.sh

@@ -34,6 +34,7 @@ function update_script() {
   fi
   msg_info "Updating $APP (Patience)"
   cd /opt/memos
+  git reset --hard HEAD
   output=$(git pull --no-rebase)
   if echo "$output" | grep -q "Already up to date."; then
     msg_ok "$APP is already up to date."
@@ -60,4 +61,4 @@ description
 msg_ok "Completed Successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
 echo -e "${INFO}${YW} Access it using the following URL:${CL}"
-echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:9030${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:9030${CL}"

ct/pf2etools.sh

@@ -50,6 +50,10 @@ function update_script() {
         unzip -q "${RELEASE}.zip"
         rm -rf "/opt/${APP}"
         mv "${APP}-${RELEASE:1}" "/opt/${APP}"
+        cd /opt/Pf2eTools
+        $STD npm install
+        $STD npm run build
+        cd ~
         echo "${RELEASE}" >"/opt/${APP}_version.txt"
         msg_ok "Updated ${APP}"
 
@@ -58,7 +62,7 @@ function update_script() {
 
         # Cleaning up
         msg_info "Cleaning Up"
-        rm "${RELEASE}.zip"
+        rm -rf /opt/${APP}/${RELEASE}.zip
         $STD apt-get -y autoremove
         $STD apt-get -y autoclean
         msg_ok "Cleanup Completed"

ct/zabbix.sh

@@ -41,7 +41,7 @@ function update_script() {
     cp /etc/zabbix/zabbix_server.conf /opt/zabbix-backup/
     cp /etc/apache2/conf-enabled/zabbix.conf /opt/zabbix-backup/
     cp -R /usr/share/zabbix/ /opt/zabbix-backup/
-    cp -R /usr/share/zabbix-* /opt/zabbix-backup/
+    #cp -R /usr/share/zabbix-* /opt/zabbix-backup/ Remove temporary
     rm -Rf /etc/apt/sources.list.d/zabbix.list
     cd /tmp
     wget -q https://repo.zabbix.com/zabbix/7.2/release/debian/pool/main/z/zabbix-release/zabbix-release_latest+debian12_all.deb

ct/zigbee2mqtt.sh

@@ -32,91 +32,35 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  if [[ "$(node -v | cut -d 'v' -f 2)" == "18."* ]]; then
-    if ! command -v npm >/dev/null 2>&1; then
-      echo "Installing NPM..."
-      apt-get install -y npm >/dev/null 2>&1
-      echo "Installed NPM..."
-    fi
+  RELEASE=$(curl -s https://api.github.com/repos/Koenkk/zigbee2mqtt/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
+  if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
+    msg_info "Stopping Service"
+    systemctl stop zigbee2mqtt
+    msg_ok "Stopped Service"
+
+    msg_info "Creating Backup"
+    mkdir -p /opt/z2m_backup
+    tar -czf /opt/z2m_backup/${APP}_backup_$(date +%Y%m%d%H%M%S).tar.gz -C /opt zigbee2mqtt &>/dev/null
+    mv /opt/zigbee2mqtt/data /opt/z2m_backup
+    msg_ok "Backup Created"
+
+    msg_info "Updating ${APP} to v${RELEASE}"
+    cd /opt
+    wget -q "https://github.com/Koenkk/zigbee2mqtt/archive/refs/tags/${RELEASE}.zip"
+    unzip -q ${RELEASE}.zip
+    mv zigbee2mqtt-${RELEASE} /opt/zigbee2mqtt
+    rm -rf /opt/zigbee2mqtt/data
+    mv /opt/z2m_backup/data /opt/zigbee2mqtt
+    cd /opt/zigbee2mqtt 
+    pnpm install --frozen-lockfile &>/dev/null
+    pnpm build &>/dev/null
+    msg_info "Starting Service"
+    systemctl start zigbee2mqtt
+    msg_ok "Started Service"
+    echo "${RELEASE}" >/opt/${APP}_version.txt
+  else
+    msg_ok "No update required. ${APP} is already at v${RELEASE}."
   fi
-  cd /opt/zigbee2mqtt
-
-  stop_zigbee2mqtt() {
-    if which systemctl 2>/dev/null >/dev/null; then
-      echo "Shutting down Zigbee2MQTT..."
-      sudo systemctl stop zigbee2mqtt
-    else
-      echo "Skipped stopping Zigbee2MQTT, no systemctl found"
-    fi
-  }
-
-  start_zigbee2mqtt() {
-    if which systemctl 2>/dev/null >/dev/null; then
-      echo "Starting Zigbee2MQTT..."
-      sudo systemctl start zigbee2mqtt
-    else
-      echo "Skipped starting Zigbee2MQTT, no systemctl found"
-    fi
-  }
-
-  set -e
-
-  if [ -d data-backup ]; then
-    echo "ERROR: Backup directory exists. May be previous restoring was failed?"
-    echo "1. Save 'data-backup' and 'data' dirs to safe location to make possibility to restore config later."
-    echo "2. Manually delete 'data-backup' dir and try again."
-    exit 1
-  fi
-
-  stop_zigbee2mqtt
-
-  echo "Generating a backup of the configuration..."
-  cp -R data data-backup || {
-    echo "Failed to create backup."
-    exit 1
-  }
-
-  echo "Checking if any changes were made to package-lock.json..."
-  git checkout package-lock.json || {
-    echo "Failed to check package-lock.json."
-    exit 1
-  }
-
-  echo "Initiating update..."
-  if ! git pull; then
-    echo "Update failed, temporarily storing changes and trying again."
-    git stash && git pull || (
-      echo "Update failed even after storing changes. Aborting."
-      exit 1
-    )
-  fi
-
-  echo "Acquiring necessary components..."
-  npm ci || {
-    echo "Failed to install necessary components."
-    exit 1
-  }
-
-  echo "Building..."
-  npm run build || {
-    echo "Failed to build new version."
-    exit 1
-  }
-
-  echo "Restoring configuration..."
-  cp -R data-backup/* data || {
-    echo "Failed to restore configuration."
-    exit 1
-  }
-
-  rm -rf data-backup || {
-    echo "Failed to remove backup directory."
-    exit 1
-  }
-
-  start_zigbee2mqtt
-
-  echo "Done!"
   exit
 }
 
@@ -127,4 +71,4 @@ description
 msg_ok "Completed Successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
 echo -e "${INFO}${YW} Access it using the following URL:${CL}"
-echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:9442${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:9442${CL}"

frontend/package-lock.json

@@ -31,7 +31,7 @@
         "fuse.js": "^7.0.0",
         "lucide-react": "^0.453.0",
         "mini-svg-data-uri": "^1.4.4",
-        "next": "15.0.2",
+        "next": "15.1.3",
         "next-themes": "^0.3.0",
         "nuqs": "^2.1.1",
         "pocketbase": "^0.21.4",
@@ -1556,10 +1556,9 @@
       }
     },
     "node_modules/@next/env": {
-      "version": "15.0.2",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-15.0.2.tgz",
-      "integrity": "sha512-c0Zr0ModK5OX7D4ZV8Jt/wqoXtitLNPwUfG9zElCZztdaZyNVnN40rDXVZ/+FGuR4CcNV5AEfM6N8f+Ener7Dg==",
-      "license": "MIT"
+      "version": "15.1.3",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-15.1.3.tgz",
+      "integrity": "sha512-Q1tXwQCGWyA3ehMph3VO+E6xFPHDKdHFYosadt0F78EObYxPio0S09H9UGYznDe6Wc8eLKLG89GqcFJJDiK5xw=="
     },
     "node_modules/@next/eslint-plugin-next": {
       "version": "15.0.2",
@@ -1602,13 +1601,12 @@
       }
     },
     "node_modules/@next/swc-darwin-arm64": {
-      "version": "15.0.2",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.0.2.tgz",
-      "integrity": "sha512-GK+8w88z+AFlmt+ondytZo2xpwlfAR8U6CRwXancHImh6EdGfHMIrTSCcx5sOSBei00GyLVL0ioo1JLKTfprgg==",
+      "version": "15.1.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.1.3.tgz",
+      "integrity": "sha512-aZtmIh8jU89DZahXQt1La0f2EMPt/i7W+rG1sLtYJERsP7GRnNFghsciFpQcKHcGh4dUiyTB5C1X3Dde/Gw8gg==",
       "cpu": [
         "arm64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -1618,13 +1616,12 @@
       }
     },
     "node_modules/@next/swc-darwin-x64": {
-      "version": "15.0.2",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.0.2.tgz",
-      "integrity": "sha512-KUpBVxIbjzFiUZhiLIpJiBoelqzQtVZbdNNsehhUn36e2YzKHphnK8eTUW1s/4aPy5kH/UTid8IuVbaOpedhpw==",
+      "version": "15.1.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.1.3.tgz",
+      "integrity": "sha512-aw8901rjkVBK5mbq5oV32IqkJg+CQa6aULNlN8zyCWSsePzEG3kpDkAFkkTOh3eJ0p95KbkLyWBzslQKamXsLA==",
       "cpu": [
         "x64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -1634,13 +1631,12 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "15.0.2",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.0.2.tgz",
-      "integrity": "sha512-9J7TPEcHNAZvwxXRzOtiUvwtTD+fmuY0l7RErf8Yyc7kMpE47MIQakl+3jecmkhOoIyi/Rp+ddq7j4wG6JDskQ==",
+      "version": "15.1.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.1.3.tgz",
+      "integrity": "sha512-YbdaYjyHa4fPK4GR4k2XgXV0p8vbU1SZh7vv6El4bl9N+ZSiMfbmqCuCuNU1Z4ebJMumafaz6UCC2zaJCsdzjw==",
       "cpu": [
         "arm64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -1650,13 +1646,12 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "15.0.2",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.0.2.tgz",
-      "integrity": "sha512-BjH4ZSzJIoTTZRh6rG+a/Ry4SW0HlizcPorqNBixBWc3wtQtj4Sn9FnRZe22QqrPnzoaW0ctvSz4FaH4eGKMww==",
+      "version": "15.1.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.1.3.tgz",
+      "integrity": "sha512-qgH/aRj2xcr4BouwKG3XdqNu33SDadqbkqB6KaZZkozar857upxKakbRllpqZgWl/NDeSCBYPmUAZPBHZpbA0w==",
       "cpu": [
         "arm64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -1666,13 +1661,12 @@
       }
     },
     "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "15.0.2",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.0.2.tgz",
-      "integrity": "sha512-i3U2TcHgo26sIhcwX/Rshz6avM6nizrZPvrDVDY1bXcLH1ndjbO8zuC7RoHp0NSK7wjJMPYzm7NYL1ksSKFreA==",
+      "version": "15.1.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.1.3.tgz",
+      "integrity": "sha512-uzafnTFwZCPN499fNVnS2xFME8WLC9y7PLRs/yqz5lz1X/ySoxfaK2Hbz74zYUdEg+iDZPd8KlsWaw9HKkLEVw==",
       "cpu": [
         "x64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -1682,13 +1676,12 @@
       }
     },
     "node_modules/@next/swc-linux-x64-musl": {
-      "version": "15.0.2",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.0.2.tgz",
-      "integrity": "sha512-AMfZfSVOIR8fa+TXlAooByEF4OB00wqnms1sJ1v+iu8ivwvtPvnkwdzzFMpsK5jA2S9oNeeQ04egIWVb4QWmtQ==",
+      "version": "15.1.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.1.3.tgz",
+      "integrity": "sha512-el6GUFi4SiDYnMTTlJJFMU+GHvw0UIFnffP1qhurrN1qJV3BqaSRUjkDUgVV44T6zpw1Lc6u+yn0puDKHs+Sbw==",
       "cpu": [
         "x64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -1698,13 +1691,12 @@
       }
     },
     "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "15.0.2",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.0.2.tgz",
-      "integrity": "sha512-JkXysDT0/hEY47O+Hvs8PbZAeiCQVxKfGtr4GUpNAhlG2E0Mkjibuo8ryGD29Qb5a3IOnKYNoZlh/MyKd2Nbww==",
+      "version": "15.1.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.1.3.tgz",
+      "integrity": "sha512-6RxKjvnvVMM89giYGI1qye9ODsBQpHSHVo8vqA8xGhmRPZHDQUE4jcDbhBwK0GnFMqBnu+XMg3nYukNkmLOLWw==",
       "cpu": [
         "arm64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -1714,13 +1706,12 @@
       }
     },
     "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "15.0.2",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.0.2.tgz",
-      "integrity": "sha512-foaUL0NqJY/dX0Pi/UcZm5zsmSk5MtP/gxx3xOPyREkMFN+CTjctPfu3QaqrQHinaKdPnMWPJDKt4VjDfTBe/Q==",
+      "version": "15.1.3",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.1.3.tgz",
+      "integrity": "sha512-VId/f5blObG7IodwC5Grf+aYP0O8Saz1/aeU3YcWqNdIUAmFQY3VEPKPaIzfv32F/clvanOb2K2BR5DtDs6XyQ==",
       "cpu": [
         "x64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -3024,12 +3015,11 @@
       "license": "Apache-2.0"
     },
     "node_modules/@swc/helpers": {
-      "version": "0.5.13",
-      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.13.tgz",
-      "integrity": "sha512-UoKGxQ3r5kYI9dALKJapMmuK+1zWM/H17Z1+iwnNmzcJRnfFuevZs375TA5rW31pu4BS4NoSy1fRsexDXfWn5w==",
-      "license": "Apache-2.0",
+      "version": "0.5.15",
+      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.15.tgz",
+      "integrity": "sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==",
       "dependencies": {
-        "tslib": "^2.4.0"
+        "tslib": "^2.8.0"
       }
     },
     "node_modules/@testing-library/dom": {
@@ -7104,14 +7094,13 @@
       "license": "MIT"
     },
     "node_modules/next": {
-      "version": "15.0.2",
-      "resolved": "https://registry.npmjs.org/next/-/next-15.0.2.tgz",
-      "integrity": "sha512-rxIWHcAu4gGSDmwsELXacqAPUk+j8dV/A9cDF5fsiCMpkBDYkO2AEaL1dfD+nNmDiU6QMCFN8Q30VEKapT9UHQ==",
-      "license": "MIT",
+      "version": "15.1.3",
+      "resolved": "https://registry.npmjs.org/next/-/next-15.1.3.tgz",
+      "integrity": "sha512-5igmb8N8AEhWDYzogcJvtcRDU6n4cMGtBklxKD4biYv4LXN8+awc/bbQ2IM2NQHdVPgJ6XumYXfo3hBtErg1DA==",
       "dependencies": {
-        "@next/env": "15.0.2",
+        "@next/env": "15.1.3",
         "@swc/counter": "0.1.3",
-        "@swc/helpers": "0.5.13",
+        "@swc/helpers": "0.5.15",
         "busboy": "1.6.0",
         "caniuse-lite": "^1.0.30001579",
         "postcss": "8.4.31",
@@ -7121,25 +7110,25 @@
         "next": "dist/bin/next"
       },
       "engines": {
-        "node": ">=18.18.0"
+        "node": "^18.18.0 || ^19.8.0 || >= 20.0.0"
       },
       "optionalDependencies": {
-        "@next/swc-darwin-arm64": "15.0.2",
-        "@next/swc-darwin-x64": "15.0.2",
-        "@next/swc-linux-arm64-gnu": "15.0.2",
-        "@next/swc-linux-arm64-musl": "15.0.2",
-        "@next/swc-linux-x64-gnu": "15.0.2",
-        "@next/swc-linux-x64-musl": "15.0.2",
-        "@next/swc-win32-arm64-msvc": "15.0.2",
-        "@next/swc-win32-x64-msvc": "15.0.2",
+        "@next/swc-darwin-arm64": "15.1.3",
+        "@next/swc-darwin-x64": "15.1.3",
+        "@next/swc-linux-arm64-gnu": "15.1.3",
+        "@next/swc-linux-arm64-musl": "15.1.3",
+        "@next/swc-linux-x64-gnu": "15.1.3",
+        "@next/swc-linux-x64-musl": "15.1.3",
+        "@next/swc-win32-arm64-msvc": "15.1.3",
+        "@next/swc-win32-x64-msvc": "15.1.3",
         "sharp": "^0.33.5"
       },
       "peerDependencies": {
         "@opentelemetry/api": "^1.1.0",
         "@playwright/test": "^1.41.2",
         "babel-plugin-react-compiler": "*",
-        "react": "^18.2.0 || 19.0.0-rc-02c0e824-20241028",
-        "react-dom": "^18.2.0 || 19.0.0-rc-02c0e824-20241028",
+        "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0",
+        "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0",
         "sass": "^1.3.0"
       },
       "peerDependenciesMeta": {

frontend/package.json

@@ -42,7 +42,7 @@
     "fuse.js": "^7.0.0",
     "lucide-react": "^0.453.0",
     "mini-svg-data-uri": "^1.4.4",
-    "next": "15.0.2",
+    "next": "15.1.3",
     "next-themes": "^0.3.0",
     "nuqs": "^2.1.1",
     "pocketbase": "^0.21.4",

install/5etools-install.sh

@@ -20,26 +20,42 @@ $STD apt-get install -y \
   mc \
   sudo \
   git \
+  gpg \
+  ca-certificates \
   apache2
 msg_ok "Installed Dependencies"
 
+msg_info "Setting up Node.js Repository"
+mkdir -p /etc/apt/keyrings
+curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" >/etc/apt/sources.list.d/nodesource.list
+msg_ok "Set up Node.js Repository"
+
+msg_info "Installing Node.js"
+$STD apt-get update
+$STD apt-get install -y nodejs
+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"
 mv "5etools-src-${RELEASE:1}" /opt/5etools
+cd /opt/5etools
+$STD npm install
+$STD npm run build
 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"
@@ -57,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/homarr-install.sh

@@ -16,11 +16,15 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-$STD apt-get install -y ca-certificates
-$STD apt-get install -y gnupg
+$STD apt-get install -y \
+  sudo \
+  mc \
+  curl \
+  ca-certificates \
+  gnupg \
+  make \
+  g++ \
+  build-essential
 msg_ok "Installed Dependencies"
 
 msg_info "Setting up Node.js Repository"

install/homeassistant-core-install.sh

@@ -14,9 +14,49 @@ network_check
 update_os
 
 msg_info "Installing Dependencies (Patience)"
-$STD apt-get install -y git curl sudo mc bluez libffi-dev libssl-dev libjpeg-dev zlib1g-dev autoconf build-essential libopenjp2-7 libturbojpeg0-dev ffmpeg liblapack3 liblapack-dev dbus-broker libpcap-dev libavdevice-dev libavformat-dev libavcodec-dev libavutil-dev libavfilter-dev libmariadb-dev-compat libatlas-base-dev pip python3.12-dev
+$STD apt-get install -y \
+  curl \
+  git \
+  sudo \
+  mc \
+  gnupg \
+  ca-certificates \
+  bluez \
+  libtiff6 \
+  tzdata \
+  libffi-dev \
+  libssl-dev \
+  libjpeg-dev \
+  zlib1g-dev \
+  autoconf \
+  build-essential \
+  libopenjp2-7 \
+  libturbojpeg0-dev \
+  ffmpeg \
+  liblapack3 \
+  liblapack-dev \
+  dbus-broker \
+  libpcap-dev \
+  libavdevice-dev \
+  libavformat-dev \
+  libavcodec-dev \
+  libavutil-dev \
+  libavfilter-dev \
+  libmariadb-dev-compat \
+  libatlas-base-dev \
+  software-properties-common
 msg_ok "Installed Dependencies"
 
+msg_info "Setup Python3"
+$STD add-apt-repository -y ppa:deadsnakes/ppa
+$STD apt-get update
+$STD apt-get install -y \
+  python3.13-* \
+  python3-pip \
+  python3.13-dev \
+  python3.13-venv
+msg_ok "Setup Python3"
+
 msg_info "Installing UV"
 $STD pip install uv
 msg_ok "Installed UV"

install/lazylibrarian-install.sh

@@ -15,15 +15,21 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-$STD apt-get install -y git
+$STD apt-get install -y \
+    curl \
+    sudo \
+    mc \
+    git \
+    libpng-dev \
+    libjpeg-dev \
+    libtiff-dev \
+    imagemagick
 msg_ok "Installed Dependencies"
 
 msg_info "Installing Python3 Dependencies"
-$STD apt-get install -y pip
-$STD apt-get install -y python3-irc
+$STD apt-get install -y \
+    pip \
+    python3-irc
 $STD pip install jaraco.stream
 $STD pip install python-Levenshtein
 $STD pip install soupsieve
@@ -31,6 +37,8 @@ msg_ok "Installed Python3 Dependencies"
 
 msg_info "Installing LazyLibrarian"
 $STD git clone https://gitlab.com/LazyLibrarian/LazyLibrarian /opt/LazyLibrarian
+cd /opt/LazyLibrarian
+$STD pip install .
 msg_ok "Installed LazyLibrarian"
 
 msg_info "Creating Service"

install/onedev-install.sh

@@ -19,7 +19,8 @@ $STD apt-get install -y \
     mc \
     sudo \
     default-jdk \
-    git
+    git \
+    git-lfs
 msg_ok "Installed Dependencies"
 
 
@@ -41,4 +42,4 @@ msg_info "Cleaning up"
 rm -rf /opt/onedev-latest.tar.gz
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
-msg_ok "Cleaned"
+msg_ok "Cleaned"

install/pf2etools-install.sh

@@ -20,15 +20,32 @@ $STD apt-get install -y \
   mc \
   sudo \
   apache2 \
+  gpg \
+  ca-certificates \
   git
 msg_ok "Installed Dependencies"
 
+msg_info "Setting up Node.js Repository"
+mkdir -p /etc/apt/keyrings
+curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" >/etc/apt/sources.list.d/nodesource.list
+msg_ok "Set up Node.js Repository"
+
+msg_info "Installing Node.js"
+$STD apt-get update
+$STD apt-get install -y nodejs
+msg_ok "Installed Node.js"
+
 # Setup App
 msg_info "Setup Pf2eTools"
 RELEASE=$(curl -s https://api.github.com/repos/Pf2eToolsOrg/Pf2eTools/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
 wget -q "https://github.com/Pf2eToolsOrg/Pf2eTools/archive/refs/tags/${RELEASE}.zip"
 unzip -q "${RELEASE}.zip"
 mv "Pf2eTools-${RELEASE:1}" /opt/Pf2eTools
+cd /opt/Pf2eTools
+$STD npm install
+$STD npm run build
+cd ~
 echo "${RELEASE}" >/opt/Pf2eTools_version.txt
 msg_ok "Set up Pf2eTools"
 

install/zigbee2mqtt-install.sh

@@ -14,21 +14,22 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-$STD apt-get install -y git
-$STD apt-get install -y make
-$STD apt-get install -y g++
-$STD apt-get install -y gcc
-$STD apt-get install -y ca-certificates
-$STD apt-get install -y gnupg
+$STD apt-get install -y \
+  curl \
+  sudo \
+  mc \
+  git \
+  make \
+  g++ \
+  gcc \
+  ca-certificates \
+  gnupg
 msg_ok "Installed Dependencies"
 
 msg_info "Setting up Node.js Repository"
 mkdir -p /etc/apt/keyrings
 curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" >/etc/apt/sources.list.d/nodesource.list
+echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" >/etc/apt/sources.list.d/nodesource.list
 msg_ok "Set up Node.js Repository"
 
 msg_info "Installing Node.js"
@@ -36,37 +37,47 @@ $STD apt-get update
 $STD apt-get install -y nodejs
 msg_ok "Installed Node.js"
 
-msg_info "Setting up Zigbee2MQTT Repository"
-$STD git clone --depth 1 https://github.com/Koenkk/zigbee2mqtt.git /opt/zigbee2mqtt
-msg_ok "Set up Zigbee2MQTT Repository"
+msg_info "Installing pnpm"
+$STD npm install -g pnpm
+msg_ok "Installed pnpm"
 
-msg_info "Installing Zigbee2MQTT"
+msg_info "Setting up Zigbee2MQTT"
+cd /opt
+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
+mv zigbee2mqtt-${RELEASE} /opt/zigbee2mqtt
+cd /opt/zigbee2mqtt/data
+mv configuration.example.yaml configuration.yaml
 cd /opt/zigbee2mqtt
-$STD npm ci
+$STD pnpm install --frozen-lockfile
+$STD pnpm build
 msg_ok "Installed Zigbee2MQTT"
 
 msg_info "Creating Service"
-service_path="/etc/systemd/system/zigbee2mqtt.service"
-echo "[Unit]
+cat <<EOF >/etc/systemd/system/zigbee2mqtt.service
+[Unit]
 Description=zigbee2mqtt
 After=network.target
 [Service]
 Environment=NODE_ENV=production
-ExecStart=/usr/bin/npm start
+ExecStart=/usr/bin/pnpm start
 WorkingDirectory=/opt/zigbee2mqtt
 StandardOutput=inherit
 StandardError=inherit
 Restart=always
 User=root
 [Install]
-WantedBy=multi-user.target" >$service_path
-$STD systemctl enable zigbee2mqtt.service
+WantedBy=multi-user.target
+EOF
+systemctl enable -q --now zigbee2mqtt.service
 msg_ok "Created Service"
 
 motd_ssh
 customize
 
 msg_info "Cleaning up"
+rm -rf /opt/${RELEASE}.zip
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"

json/nextcloudpi.json

@@ -41,5 +41,10 @@
         "username": null,
         "password": null
     },
-    "notes": []
+    "notes": [
+        {
+            "text": "Only Alpine: To get the username and password, run the script again inside the LXC shell.",
+            "type": "warning"
+        }
+    ]
 }

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