From 810eadd3989103910983416f7ee0e4b79ab6b6cd Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Tue, 1 Apr 2025 11:12:42 +0200
Subject: [PATCH] Fix Rustdeskserver (curl)

---
 ct/rustdeskserver.sh              | 11 +++++++----
 install/rustdeskserver-install.sh | 19 ++++++++++++-------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/ct/rustdeskserver.sh b/ct/rustdeskserver.sh
index 34285c1ef..ffe26a4ea 100644
--- a/ct/rustdeskserver.sh
+++ b/ct/rustdeskserver.sh
@@ -37,9 +37,12 @@ function update_script() {
 
         msg_info "Updating $APP to v${RELEASE}"
         TEMPDIR=$(mktemp -d)
-curl -fsSL "https://github.com/rustdesk/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-hbbr_${RELEASE}_amd64.deb" -P $TEMPDIR" -o $(basename "https://github.com/rustdesk/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-hbbr_${RELEASE}_amd64.deb" -P $TEMPDIR")
-curl -fsSL "https://github.com/rustdesk/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-hbbs_${RELEASE}_amd64.deb" -P $TEMPDIR" -o $(basename "https://github.com/rustdesk/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-hbbs_${RELEASE}_amd64.deb" -P $TEMPDIR")
-curl -fsSL "https://github.com/rustdesk/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-utils_${RELEASE}_amd64.deb" -P $TEMPDIR" -o $(basename "https://github.com/rustdesk/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-utils_${RELEASE}_amd64.deb" -P $TEMPDIR")
+        curl -fsSL "https://github.com/rustdesk/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-hbbr_${RELEASE}_amd64.deb" \
+            -o "${TEMPDIR}/rustdesk-server-hbbr_${RELEASE}_amd64.deb"
+        curl -fsSL "https://github.com/rustdesk/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-hbbs_${RELEASE}_amd64.deb" \
+            -o "${TEMPDIR}/rustdesk-server-hbbs_${RELEASE}_amd64.deb"
+        curl -fsSL "https://github.com/rustdesk/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-utils_${RELEASE}_amd64.deb" \
+            -o "${TEMPDIR}/rustdesk-server-utils_${RELEASE}_amd64.deb"
         $STD dpkg -i $TEMPDIR/*.deb
         msg_ok "Updated $APP to v${RELEASE}"
 
@@ -62,4 +65,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}${IP}${CL}"
\ No newline at end of file
+echo -e "${TAB}${GATEWAY}${BGN}${IP}${CL}"
diff --git a/install/rustdeskserver-install.sh b/install/rustdeskserver-install.sh
index e654ca06c..e2c9adf9a 100644
--- a/install/rustdeskserver-install.sh
+++ b/install/rustdeskserver-install.sh
@@ -14,13 +14,18 @@ network_check
 update_os
 
 msg_info "Setup RustDesk"
-RELEASE=$(curl -fsSL https://api.github.com/repos/rustdesk/rustdesk-server/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
+
+RELEASE=$(curl -fsSL https://api.github.com/repos/rustdesk/rustdesk-server/releases/latest | grep "tag_name" | awk -F '"' '{print $4}')
 TEMPDIR=$(mktemp -d)
-curl -fsSL "https://github.com/rustdesk/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-hbbr_${RELEASE}_amd64.deb" -P $TEMPDIR" -o $(basename "https://github.com/rustdesk/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-hbbr_${RELEASE}_amd64.deb" -P $TEMPDIR")
-curl -fsSL "https://github.com/rustdesk/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-hbbs_${RELEASE}_amd64.deb" -P $TEMPDIR" -o $(basename "https://github.com/rustdesk/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-hbbs_${RELEASE}_amd64.deb" -P $TEMPDIR")
-curl -fsSL "https://github.com/rustdesk/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-utils_${RELEASE}_amd64.deb" -P $TEMPDIR" -o $(basename "https://github.com/rustdesk/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-utils_${RELEASE}_amd64.deb" -P $TEMPDIR")
-$STD dpkg -i $TEMPDIR/*.deb
-echo "${RELEASE}" >/opt/rustdesk.txt
+
+curl -fsSL "https://github.com/rustdesk/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-hbbr_${RELEASE}_amd64.deb" \
+    -o "${TEMPDIR}/rustdesk-server-hbbr_${RELEASE}_amd64.deb"
+curl -fsSL "https://github.com/rustdesk/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-hbbs_${RELEASE}_amd64.deb" \
+    -o "${TEMPDIR}/rustdesk-server-hbbs_${RELEASE}_amd64.deb"
+curl -fsSL "https://github.com/rustdesk/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-utils_${RELEASE}_amd64.deb" \
+    -o "${TEMPDIR}/rustdesk-server-utils_${RELEASE}_amd64.deb"
+$STD dpkg -i "${TEMPDIR}"/*.deb
+echo "${RELEASE}" >/opt/rustdesk_version.txt
 msg_ok "Setup RustDesk"
 
 motd_ssh
@@ -30,4 +35,4 @@ msg_info "Cleaning up"
 rm -rf $TEMPDIR
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
-msg_ok "Cleaned"
\ No newline at end of file
+msg_ok "Cleaned"