Update CHANGELOG.md

CHANGELOG.md

@@ -16,22 +16,6 @@ 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
 
-## 2024-12-19
-
-### Changed
-
-### 🚀 Updated Scripts
-
-- Fix: Bookstack Update Function [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#844](https://github.com/community-scripts/ProxmoxVE/pull/844))
-- mysql not showing ip after install [@snow2k9](https://github.com/snow2k9) ([#924](https://github.com/community-scripts/ProxmoxVE/pull/924))
-- Fix Omada - Crawling latest version [@MickLesk](https://github.com/MickLesk) ([#918](https://github.com/community-scripts/ProxmoxVE/pull/918))
-
-### 🌐 Website
-
-- Fix script path formatting in InstallMethod component [@BramSuurdje](https://github.com/BramSuurdje) ([#909](https://github.com/community-scripts/ProxmoxVE/pull/909))
-- Fix Part-DB Docu (cred command) [@EvilBlood](https://github.com/EvilBlood) ([#898](https://github.com/community-scripts/ProxmoxVE/pull/898))
-- Enhance Tooltip component by adding CircleHelp icon and fix instructions in script component [@BramSuurdje](https://github.com/BramSuurdje) ([#910](https://github.com/community-scripts/ProxmoxVE/pull/910))
-
 ## 2024-12-18
 
 ### Changed

ct/bookstack.sh

@@ -38,41 +38,32 @@ function update_script() {
     systemctl stop apache2
     msg_ok "Services Stopped"
 
-    msg_info "Updating ${APP} to v${RELEASE}"
-    mv /opt/bookstack /opt/bookstack-backup
-    wget -q --directory-prefix=/opt "https://github.com/BookStackApp/BookStack/archive/refs/tags/v${RELEASE}.zip"
-    unzip -q /opt/v${RELEASE}.zip -d /opt
-    mv /opt/BookStack-${RELEASE} /opt/bookstack
-    cp /opt/bookstack-backup/.env /opt/bookstack/.env
-    cp -r /opt/bookstack-backup/public/uploads/ /opt/bookstack/public/uploads
-    cp -r /opt/bookstack-backup/storage/uploads/ /opt/bookstack/storage/uploads
-    cp -r /opt/bookstack-backup/themes/ /opt/bookstack/themes
+    msg_info "Updating ${APP} to ${RELEASE}"
+    cp /opt/bookstack/.env /opt/.env
+    wget -q "https://github.com/BookStackApp/BookStack/archive/refs/tags/v${RELEASE}.zip"
+    unzip -q v${RELEASE}.zip
+    mv BookStack-${RELEASE} /opt/bookstack
+    mv /opt/.env /opt/bookstack/.env
     cd /opt/bookstack
     COMPOSER_ALLOW_SUPERUSER=1 composer install --no-dev &>/dev/null
     php artisan key:generate --force &>/dev/null
     php artisan migrate --force &>/dev/null
-    chown www-data:www-data -R /opt/bookstack /opt/bookstack/bootstrap/cache /opt/bookstack/public/uploads /opt/bookstack/storage
-    chmod -R 755 /opt/bookstack /opt/bookstack/bootstrap/cache /opt/bookstack/public/uploads /opt/bookstack/storage
-    chmod -R 775 /opt/bookstack/storage /opt/bookstack/bootstrap/cache /opt/bookstack/public/uploads
-    chmod -R 640 /opt/bookstack/.env
     echo "${RELEASE}" >/opt/${APP}_version.txt
-    msg_ok "Updated ${APP} to v${RELEASE}"
+    msg_ok "Updated ${APP}"
 
     msg_info "Starting Apache2"
     systemctl start apache2
     msg_ok "Started Apache2"
 
     msg_info "Cleaning Up"
-    rm -rf /opt/bookstack-backup
-    rm -rf /opt/v${RELEASE}.zip
+    rm -rf v${RELEASE}.zip
     msg_ok "Cleaned"
     msg_ok "Updated Successfully"
   else
-    msg_ok "No update required. ${APP} is already at v${RELEASE}"
+    msg_ok "No update required. ${APP} is already at ${RELEASE}"
   fi
   exit
 }
-
 start
 build_container
 description

ct/mysql.sh

@@ -46,4 +46,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 IP:${CL}"
-echo -e "${TAB}${GATEWAY}${BGN}${IP}:3306${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}{IP}:3306${CL}"

ct/omada.sh

@@ -32,8 +32,8 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  latest_url=$(curl -fsSL "https://www.tp-link.com/en/support/download/omada-software-controller/" | grep -oP 'href="([^"]+linux_x64[^"]+\.deb)' | sed 's/href="//' | sort | tail -n 1)
-  latest_version=$(basename "$latest_url")
+  latest_url=$(curl -fsSL "https://www.tp-link.com/en/support/download/omada-software-controller/" | grep -o 'https://.*x64.deb' | head -n1)
+  latest_version=$(basename "${latest_url}")
   if [ -z "${latest_version}" ]; then
     msg_error "It seems that the server (tp-link.com) might be down. Please try again at a later time."
     exit
@@ -53,4 +53,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}:8043${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:8043${CL}"

frontend/src/app/json-editor/_components/InstallMethod.tsx

@@ -34,7 +34,7 @@ function InstallMethod({
     setScript((prev) => {
       const method = InstallMethodSchema.parse({
         type: "default",
-        script: `${prev.type}/${prev.slug}.sh`,
+        script: `/${prev.type}/${prev.slug}.sh`,
         resources: {
           cpu: null,
           ram: null,

frontend/src/app/scripts/_components/ScriptItem.tsx

@@ -81,7 +81,7 @@ function ScriptItem({
               <div className="mt-4 rounded-lg border bg-accent/50">
                 <div className="flex gap-3 px-4 py-2">
                   <h2 className="text-lg font-semibold">
-                    How to {item.type == "misc" ? "use" : "install"}
+                    How to {item.type ? "install" : "use"}
                   </h2>
                   <Tooltips item={item} />
                 </div>

frontend/src/app/scripts/_components/ScriptItems/InstallCommand.tsx

@@ -28,17 +28,16 @@ export default function InstallCommand({ item }: { item: Script }) {
             time and minimal system resource usage. You are also obliged to
             adhere to updates provided by the package maintainer.
           </>
-        ) : item.type == "misc" ? (
+        ) : item.type ? (
           <>
-            To use the {item.name} script, run the command below in the shell.
-          </>
-        ) : (
-          <>
-            {" "}
             To create a new Proxmox VE {item.name}{" "}
             {getDisplayValueFromType(item.type)}, run the command below in the
             Proxmox VE Shell.
           </>
+        ) : (
+          <>
+            To use the {item.name} script, run the command below in the shell.
+          </>
         )}
       </p>
       {isAlpine && (

frontend/src/app/scripts/_components/ScriptItems/Tooltips.tsx

@@ -6,7 +6,6 @@ import {
   TooltipTrigger,
 } from "@/components/ui/tooltip";
 import { Script } from "@/lib/types";
-import { CircleHelp } from "lucide-react";
 import React from "react";
 
 interface TooltipProps {
@@ -19,11 +18,9 @@ const TooltipBadge: React.FC<TooltipProps> = ({ variant, label, content }) => (
   <TooltipProvider>
     <Tooltip delayDuration={100}>
       <TooltipTrigger className="flex items-center">
-        <Badge variant={variant} className="flex items-center gap-1">
-          {label} <CircleHelp className="size-3" />
-        </Badge>
+        <Badge variant={variant}>{label}</Badge>
       </TooltipTrigger>
-      <TooltipContent side="bottom" className="text-sm max-w-64">
+      <TooltipContent side="bottom" className="text-sm">
         {content}
       </TooltipContent>
     </Tooltip>

install/omada-install.sh

@@ -14,12 +14,11 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y \
-  curl \
-  sudo \
-  mc \
-  gnupg \
-  jsvc
+$STD apt-get install -y curl
+$STD apt-get install -y sudo
+$STD apt-get install -y mc
+$STD apt-get install -y gnupg
+$STD apt-get install -y jsvc
 msg_ok "Installed Dependencies"
 
 msg_info "Installing Azul Zulu"
@@ -38,7 +37,7 @@ wget -qL https://repo.mongodb.org/apt/ubuntu/dists/bionic/mongodb-org/3.6/multiv
 $STD dpkg -i mongodb-org-server_3.6.23_amd64.deb
 msg_ok "Installed MongoDB"
 
-latest_url=$(curl -fsSL "https://www.tp-link.com/en/support/download/omada-software-controller/" | grep -oP 'href="([^"]+linux_x64[^"]+\.deb)' | sed 's/href="//' | sort | tail -n 1)
+latest_url=$(curl -fsSL "https://www.tp-link.com/en/support/download/omada-software-controller/" | grep -o 'https://.*x64.deb' | head -n1)
 latest_version=$(basename "$latest_url")
 
 msg_info "Installing Omada Controller"

json/add-lxc-iptag.json

@@ -33,15 +33,11 @@
     "notes": [
         {
             "text": "Execute within the Proxmox shell",
-            "type": "info"
+            "type": "Info"
         },
         {
             "text": "Configuration: `nano /opt/lxc-iptag/iptag.conf`. iptag.service must be restarted after change.",
-            "type": "info"
-        },
-        {
-            "text": "The Proxmox Node must contain ipcalc and net-tools. `apt-get install -y ipcalc net-tools`",
-            "type": "warn"
+            "type": "Info"
         }
     ]
 }

json/part-db.json

@@ -32,7 +32,7 @@
     },
     "notes": [
         {
-            "text": "Show login and database credentials: `cat partdb.creds`",
+            "text": "Show login and database credentials: `cat part-db.creds`",
             "type": "info"
         }
     ]