From 96e108037c2d78efb1ee5eefa3038c0be09fca8b Mon Sep 17 00:00:00 2001
From: Jack Kingsman <jack.kingsman@gmail.com>
Date: Tue, 31 Mar 2026 22:21:06 -0700
Subject: [PATCH] Updating changelog + build for 3.6.5

---
 CHANGELOG.md             |  4 ++++
 frontend/package.json    |  2 +-
 pyproject.toml           |  2 +-
 scripts/build/publish.sh | 39 ++++++++++++++++-----------------------
 uv.lock                  |  2 +-
 5 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcf6f11..af7c4ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [3.6.5] - 2026-03-31
+
+* Bugfix: Maybe fix problem with publish script
+
 ## [3.6.4] - 2026-03-31
 
 * Feature: Clarify New Channel/Contact button
diff --git a/frontend/package.json b/frontend/package.json
index df0ec31..728caff 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "remoteterm-meshcore-frontend",
   "private": true,
-  "version": "3.6.4",
+  "version": "3.6.5",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/pyproject.toml b/pyproject.toml
index 3e6a01e..89fc772 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "remoteterm-meshcore"
-version = "3.6.4"
+version = "3.6.5"
 description = "RemoteTerm - Web interface for MeshCore radio mesh networks"
 readme = "README.md"
 requires-python = ">=3.10"
diff --git a/scripts/build/publish.sh b/scripts/build/publish.sh
index c98bc0e..6b4dbd8 100755
--- a/scripts/build/publish.sh
+++ b/scripts/build/publish.sh
@@ -30,28 +30,6 @@ cleanup_release_build_artifacts() {
 
 trap cleanup_release_build_artifacts EXIT
 
-ensure_buildx_builder() {
-    if ! docker buildx version >/dev/null 2>&1; then
-        echo -e "${RED}Error: docker buildx is required for multi-arch Docker builds.${NC}"
-        exit 1
-    fi
-
-    local current_builder
-    current_builder="$(docker buildx inspect --format '{{ .Name }}' 2>/dev/null || true)"
-
-    if [ -n "$current_builder" ]; then
-        docker buildx inspect --bootstrap >/dev/null
-        return
-    fi
-
-    if docker buildx inspect remoteterm-multiarch >/dev/null 2>&1; then
-        docker buildx use remoteterm-multiarch >/dev/null
-    else
-        docker buildx create --name remoteterm-multiarch --use >/dev/null
-    fi
-    docker buildx inspect --bootstrap >/dev/null
-}
-
 echo -e "${YELLOW}=== RemoteTerm for MeshCore Publish Script ===${NC}"
 echo
 
@@ -236,7 +214,22 @@ echo
 
 # Build and push multi-arch docker image
 echo -e "${YELLOW}Building and pushing multi-arch Docker image...${NC}"
-ensure_buildx_builder
+if ! docker buildx version >/dev/null 2>&1; then
+    echo -e "${RED}Error: docker buildx is required for multi-arch Docker builds.${NC}"
+    exit 1
+fi
+
+CURRENT_BUILDER="$(docker buildx inspect --format '{{ .Name }}' 2>/dev/null || true)"
+if [ -n "$CURRENT_BUILDER" ]; then
+    docker buildx inspect --bootstrap >/dev/null
+elif docker buildx inspect remoteterm-multiarch >/dev/null 2>&1; then
+    docker buildx use remoteterm-multiarch >/dev/null
+    docker buildx inspect --bootstrap >/dev/null
+else
+    docker buildx create --name remoteterm-multiarch --use >/dev/null
+    docker buildx inspect --bootstrap >/dev/null
+fi
+
 docker buildx build \
     --platform "$DOCKER_PLATFORMS" \
     --build-arg COMMIT_HASH="$GIT_HASH" \
diff --git a/uv.lock b/uv.lock
index e8f5421..56fb427 100644
--- a/uv.lock
+++ b/uv.lock
@@ -1098,7 +1098,7 @@ wheels = [
 
 [[package]]
 name = "remoteterm-meshcore"
-version = "3.6.4"
+version = "3.6.5"
 source = { virtual = "." }
 dependencies = [
     { name = "aiomqtt" },