From c97083e6858ef81a9a12417b5ee16ab74173ecea Mon Sep 17 00:00:00 2001
From: Sam Heinz <54530346+asylumexp@users.noreply.github.com>
Date: Fri, 26 Jun 2026 21:58:48 +1000
Subject: [PATCH] fix databasus update/install errors

---
 ct/databasus.sh              | 6 +++---
 install/databasus-install.sh | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ct/databasus.sh b/ct/databasus.sh
index 8e5cc5df9..c09ecc504 100644
--- a/ct/databasus.sh
+++ b/ct/databasus.sh
@@ -52,11 +52,11 @@ function update_script() {
       [[ "$MONGO_ARCH" == "arm64" ]] && MONGO_DIST="ubuntu2204"
       fetch_and_deploy_from_url "https://fastdl.mongodb.org/tools/db/mongodb-database-tools-${MONGO_DIST}-${MONGO_ARCH}-100.16.1.deb"
     fi
+    ensure_dependencies mariadb-client
+    mkdir -p /usr/local/mariadb-{10.6,12.1}/bin /usr/local/mysql-{5.7,8.0,8.4,9}/bin /usr/local/mongodb-database-tools/bin
     [[ -f /usr/bin/mongodump ]] && ln -sf /usr/bin/mongodump /usr/local/mongodb-database-tools/bin/mongodump
     [[ -f /usr/bin/mongorestore ]] && ln -sf /usr/bin/mongorestore /usr/local/mongodb-database-tools/bin/mongorestore
     # Create MariaDB and MySQL client symlinks for compatibility
-    ensure_dependencies mariadb-client
-    mkdir -p /usr/local/mariadb-{10.6,12.1}/bin /usr/local/mysql-{5.7,8.0,8.4,9}/bin /usr/local/mongodb-database-tools/bin
     for dir in /usr/local/mariadb-{10.6,12.1}/bin; do
       ln -sf /usr/bin/mariadb-dump "$dir/mariadb-dump"
       ln -sf /usr/bin/mariadb "$dir/mariadb"
@@ -79,7 +79,7 @@ function update_script() {
     cd /opt/databasus/backend
     $STD go mod download
     $STD /root/go/bin/swag init -g cmd/main.go -o swagger
-    $STD env CGO_ENABLED=0 GOOS=linux GOARCH=$(arch_resolve) go build -o databasus ./cmd/main.go
+    $STD env CGO_ENABLED=0 GOOS=linux GOARCH=$(arch_resolve) go build -o databasus ./cmd
     mv /opt/databasus/backend/databasus /opt/databasus/databasus
     mkdir -p /opt/databasus/ui/build
     cp -r /opt/databasus/frontend/dist/* /opt/databasus/ui/build/
diff --git a/install/databasus-install.sh b/install/databasus-install.sh
index 1f81d8b0d..da8bafaa0 100644
--- a/install/databasus-install.sh
+++ b/install/databasus-install.sh
@@ -33,7 +33,7 @@ done
 # Install MongoDB Database Tools via direct .deb (no APT repo for Debian 13)
 [[ "$(get_os_info id)" == "ubuntu" ]] && MONGO_DIST="ubuntu2204" || MONGO_DIST="debian12"
 # MongoDB only publishes arm64 builds for Ubuntu
-[[ "$MONGO_ARCH" == "arm64" ]] && MONGO_DIST="ubuntu2204"
+[[ "$(arch_resolve "x86_64" "arm64")" == "arm64" ]] && MONGO_DIST="ubuntu2204"
 MONGO_VERSION=$(get_latest_gh_tag "mongodb/mongo-tools" "100." || echo "100.16.1")
 fetch_and_deploy_from_url "https://fastdl.mongodb.org/tools/db/mongodb-database-tools-${MONGO_DIST}-$(arch_resolve "x86_64" "arm64")-${MONGO_VERSION}.deb" ""
 mkdir -p /usr/local/mongodb-database-tools/bin
@@ -65,7 +65,7 @@ $STD go mod tidy
 $STD go mod download
 $STD go install github.com/swaggo/swag/cmd/swag@latest
 $STD /root/go/bin/swag init -g cmd/main.go -o swagger
-$STD env CGO_ENABLED=0 GOOS=linux GOARCH=$(arch_resolve) go build -o databasus ./cmd/main.go
+$STD env CGO_ENABLED=0 GOOS=linux GOARCH=$(arch_resolve) go build -o databasus ./cmd
 mv /opt/databasus/backend/databasus /opt/databasus/databasus
 mkdir -p /databasus-data/{pgdata,temp,backups,data,logs}
 mkdir -p /opt/databasus/ui/build