From cf2482cdd17443f54f5894fdad65ca7758471b18 Mon Sep 17 00:00:00 2001
From: Omar <omiinaya@gmail.com>
Date: Fri, 23 May 2025 02:47:05 -0400
Subject: [PATCH] updating as requested

---
 ct/convertx.sh                     | 10 +++++---
 frontend/public/json/convertx.json |  6 +----
 install/convertx-install.sh        | 41 +++++++++++++++++-------------
 3 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/ct/convertx.sh b/ct/convertx.sh
index 0284a2e..8c57674 100644
--- a/ct/convertx.sh
+++ b/ct/convertx.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-source <(curl -s https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/build.func)
+source <(curl -s https://raw.githubusercontent.com/omiinaya/ProxmoxVED/refs/heads/testing/misc/build.func)
 # Copyright (c) 2021-2025 community-scripts ORG
 # Author: Omar Minaya
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
@@ -28,11 +28,15 @@ function update_script() {
         exit
     fi
     msg_info "Updating $APP LXC"
+    RELEASE=$(curl -fsSL https://api.github.com/repos/C4illin/ConvertX/releases/latest | jq -r .tag_name | sed 's/^v//')
+    curl -fsSL -o "/opt/convertx/ConvertX-${RELEASE}.tar.gz" "https://github.com/C4illin/ConvertX/archive/refs/tags/v${RELEASE}.tar.gz"
+    tar --strip-components=1 -xf "/opt/convertx/ConvertX-${RELEASE}.tar.gz" -C /opt/convertx
     cd /opt/convertx
-    git pull origin main
+    bun update
+
+    $STD systemctl restart convertx
     $STD apt-get update
     $STD apt-get -y upgrade
-    $STD systemctl restart convertx.service
     msg_ok "Updated $APP LXC"
     exit
 }
diff --git a/frontend/public/json/convertx.json b/frontend/public/json/convertx.json
index 47857fc..3edcc3c 100644
--- a/frontend/public/json/convertx.json
+++ b/frontend/public/json/convertx.json
@@ -33,11 +33,7 @@
     },
     "notes": [
         {
-            "text": "WARNING: Installation clones a repository from github.com/C4illin/ConvertX. Please verify the source before installing.",
-            "type": "warning"
-        },
-        {
-            "text": "Complete setup via the web interface at http://<container-ip>:3000. Create and secure the admin account immediately. Check installation logs: `cat ~/convertx-install.log`",
+            "text": "Complete setup via the web interface at http://<container-ip>:3000. Create and secure the admin account immediately.",
             "type": "info"
         }
     ]
diff --git a/install/convertx-install.sh b/install/convertx-install.sh
index 2ee51d3..7aa3952 100644
--- a/install/convertx-install.sh
+++ b/install/convertx-install.sh
@@ -14,14 +14,23 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y git curl ffmpeg
+$STD apt-get install -y \
+    curl \
+    ffmpeg \
+    jq
 msg_ok "Installed Dependencies"
 
 msg_info "Installing ConvertX"
-$STD curl -fsSL "https://bun.sh/install" | bash
-$STD ln -sf /root/.bun/bin/bun /usr/local/bin/bun
-$STD git clone "https://github.com/C4illin/ConvertX.git" /opt/convertx
-$STD cd /opt/convertx && bun install
+curl -fsSL "https://bun.sh/install" | bash
+ln -sf /root/.bun/bin/bun /usr/local/bin/bun
+mkdir -p /opt/convertx
+
+RELEASE=$(curl -fsSL https://api.github.com/repos/C4illin/ConvertX/releases/latest | jq -r .tag_name | sed 's/^v//')
+curl -fsSL -o "/opt/convertx/ConvertX-${RELEASE}.tar.gz" "https://github.com/C4illin/ConvertX/archive/refs/tags/v${RELEASE}.tar.gz"
+tar --strip-components=1 -xf "/opt/convertx/ConvertX-${RELEASE}.tar.gz" -C /opt/convertx
+cd /opt/convertx
+mkdir -p data
+bun install
 
 JWT_SECRET=$(openssl rand -base64 32 | tr -dc 'a-zA-Z0-9' | head -c 32)
 cat <<EOF >/opt/convertx/.env
@@ -47,27 +56,23 @@ Restart=always
 [Install]
 WantedBy=multi-user.target
 EOF
+systemctl enable -q --now convertx
 msg_ok "Service Created"
 
-msg_info "Waiting for SQLite database to be created"
-TIMEOUT=60
-COUNT=0
-while [[ ! -f "/opt/convertx/data/mydb.sqlite" && $COUNT -lt $TIMEOUT ]]; do
-    sleep 0.5
-    COUNT=$((COUNT + 1))
+msg_info "Waiting for SQLite database"
+for ((COUNT=0; COUNT<60; COUNT++)); do
+  [ -f "/opt/convertx/data/mydb.sqlite" ] && { systemctl restart convertx; exit 0; }
+  sleep 0.5
 done
-if [[ -f "/opt/convertx/data/mydb.sqlite" ]]; then
-    systemctl enable -q --now convertx
-else
-    msg_error "Timed out waiting for /opt/convertx/data/mydb.sqlite to be created!"
-    exit 1
-fi
-msg_ok "Database Created"
+msg_error "Timed out waiting for database!"
+exit 1
+msg_ok "Database created"
 
 motd_ssh
 customize
 
 msg_info "Cleaning up"
+$STD rm -f /opt/ConvertX-${RELEASE}.tar.gz
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"