From 985d115a3fff2c4a4d5a27c0744a66e57dea163d Mon Sep 17 00:00:00 2001
From: myoffice-sync <myoffice-sync@local>
Date: Wed, 5 Aug 2026 12:20:44 +0000
Subject: [PATCH] sync build tree from private myoffice

---
 README.md                |  6 +-----
 proxmox/fetch-release.sh |  2 +-
 proxmox/install-in-ct.sh |  2 +-
 proxmox/myoffice.sh      | 41 +++++++++++++++-------------------------
 proxmox/update.sh        |  2 +-
 5 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index 62a859b..fea4383 100644
--- a/README.md
+++ b/README.md
@@ -12,13 +12,9 @@ bash -c "$(curl -fsSL https://mygit.ase.com.ua/alexandr/myoffice_public/raw/bran
 
 Creates an LXC with PostgreSQL + ASP.NET runtime, downloads the latest release, starts the app on port **9100**. Point your nginx LXC at `http://<ct-ip>:9100`.
 
-Optional:
+Optional overrides:
 
 ```bash
-export GITEA_URL="https://mygit.ase.com.ua"
-export GITEA_OWNER="alexandr"
-export GITEA_REPO="myoffice_public"
-export GITEA_BRANCH="master"
 export RELEASE_TAG="latest"   # or v1.2.3
 ```
 
diff --git a/proxmox/fetch-release.sh b/proxmox/fetch-release.sh
index 9d6ce5f..588e724 100644
--- a/proxmox/fetch-release.sh
+++ b/proxmox/fetch-release.sh
@@ -11,7 +11,7 @@ set -euo pipefail
 API_DIR="${API_DIR:-/opt/myoffice/api}"
 GITEA_URL="${GITEA_URL:-}"
 GITEA_OWNER="${GITEA_OWNER:-}"
-GITEA_REPO="${GITEA_REPO:-myoffice-public}"
+GITEA_REPO="${GITEA_REPO:-myoffice_public}"
 RELEASE_TAG="${RELEASE_TAG:-latest}"
 RELEASE_ASSET_URL="${RELEASE_ASSET_URL:-}"
 ASSET_NAME="${ASSET_NAME:-myoffice-publish.tar.gz}"
diff --git a/proxmox/install-in-ct.sh b/proxmox/install-in-ct.sh
index 47a352b..729c85a 100644
--- a/proxmox/install-in-ct.sh
+++ b/proxmox/install-in-ct.sh
@@ -156,7 +156,7 @@ API_PORT=${API_PORT}
 APP_DIR=${APP_DIR}
 GITEA_URL=${GITEA_URL:-}
 GITEA_OWNER=${GITEA_OWNER:-}
-GITEA_REPO=${GITEA_REPO:-myoffice-public}
+GITEA_REPO=${GITEA_REPO:-myoffice_public}
 RELEASE_TAG=${RELEASE_TAG:-latest}
 RELEASE_ASSET_URL=${RELEASE_ASSET_URL:-}
 EOF
diff --git a/proxmox/myoffice.sh b/proxmox/myoffice.sh
index 47628f1..0320897 100644
--- a/proxmox/myoffice.sh
+++ b/proxmox/myoffice.sh
@@ -1,47 +1,36 @@
 #!/usr/bin/env bash
 # MyOffice Proxmox LXC installer (community-scripts style).
-# Run on the Proxmox host (public Gitea repo raw URL):
-#   export GITEA_URL="https://gitea.example.com"
-#   export GITEA_OWNER="org"
-#   export GITEA_REPO="myoffice-public"
-#   export GITEA_BRANCH="master"
-#   export REPO_RAW_BASE="${GITEA_URL}/${GITEA_OWNER}/${GITEA_REPO}/raw/branch/${GITEA_BRANCH}"
-#   bash -c "$(curl -fsSL ${REPO_RAW_BASE}/proxmox/myoffice.sh)"
+# One-liner (env optional — defaults match public repo):
+#   bash -c "$(curl -fsSL https://mygit.ase.com.ua/alexandr/myoffice_public/raw/branch/master/proxmox/myoffice.sh)"
 #
 # Creates one LXC with PostgreSQL + ASP.NET runtime + app from Gitea Release.
 # No Docker, no nginx, no git/SDK/Node in the CT (use your existing proxy LXC in front).
 
 set -euo pipefail
 
-GITEA_URL="${GITEA_URL:-}"
-GITEA_OWNER="${GITEA_OWNER:-}"
-GITEA_REPO="${GITEA_REPO:-myoffice-public}"
+GITEA_URL="${GITEA_URL:-https://mygit.ase.com.ua}"
+GITEA_OWNER="${GITEA_OWNER:-alexandr}"
+GITEA_REPO="${GITEA_REPO:-myoffice_public}"
 GITEA_BRANCH="${GITEA_BRANCH:-master}"
 RELEASE_TAG="${RELEASE_TAG:-latest}"
 RELEASE_ASSET_URL="${RELEASE_ASSET_URL:-}"
 GITEA_TOKEN="${GITEA_TOKEN:-}"
 
 if [[ -z "${REPO_RAW_BASE:-}" ]]; then
-  if [[ -n "$GITEA_URL" && -n "$GITEA_OWNER" ]]; then
-    REPO_RAW_BASE="${GITEA_URL%/}/${GITEA_OWNER}/${GITEA_REPO}/raw/branch/${GITEA_BRANCH}"
-  else
-    REPO_RAW_BASE="https://gitea.example.com/OWNER/myoffice-public/raw/branch/${GITEA_BRANCH}"
-  fi
+  REPO_RAW_BASE="${GITEA_URL%/}/${GITEA_OWNER}/${GITEA_REPO}/raw/branch/${GITEA_BRANCH}"
 fi
 
 # Derive GITEA_* from REPO_RAW_BASE when only raw base is set:
 #   https://host/owner/repo/raw/branch/master
-if [[ -z "$GITEA_URL" || -z "$GITEA_OWNER" ]]; then
-  if [[ "$REPO_RAW_BASE" =~ ^(https?://[^/]+)/([^/]+)/([^/]+)/raw/branch/([^/]+) ]]; then
-    [[ -z "$GITEA_URL" ]] && GITEA_URL="${BASH_REMATCH[1]}"
-    [[ -z "$GITEA_OWNER" ]] && GITEA_OWNER="${BASH_REMATCH[2]}"
-    [[ "$GITEA_REPO" == "myoffice-public" ]] && GITEA_REPO="${BASH_REMATCH[3]}"
-    GITEA_BRANCH="${BASH_REMATCH[4]}"
-  elif [[ "$REPO_RAW_BASE" =~ ^(https?://[^/]+)/([^/]+)/([^/]+)/raw/ ]]; then
-    [[ -z "$GITEA_URL" ]] && GITEA_URL="${BASH_REMATCH[1]}"
-    [[ -z "$GITEA_OWNER" ]] && GITEA_OWNER="${BASH_REMATCH[2]}"
-    [[ "$GITEA_REPO" == "myoffice-public" ]] && GITEA_REPO="${BASH_REMATCH[3]}"
-  fi
+if [[ "$REPO_RAW_BASE" =~ ^(https?://[^/]+)/([^/]+)/([^/]+)/raw/branch/([^/]+) ]]; then
+  GITEA_URL="${BASH_REMATCH[1]}"
+  GITEA_OWNER="${BASH_REMATCH[2]}"
+  GITEA_REPO="${BASH_REMATCH[3]}"
+  GITEA_BRANCH="${BASH_REMATCH[4]}"
+elif [[ "$REPO_RAW_BASE" =~ ^(https?://[^/]+)/([^/]+)/([^/]+)/raw/ ]]; then
+  GITEA_URL="${BASH_REMATCH[1]}"
+  GITEA_OWNER="${BASH_REMATCH[2]}"
+  GITEA_REPO="${BASH_REMATCH[3]}"
 fi
 
 APP="MyOffice"
diff --git a/proxmox/update.sh b/proxmox/update.sh
index 3b4dfa0..1f00715 100644
--- a/proxmox/update.sh
+++ b/proxmox/update.sh
@@ -20,7 +20,7 @@ ACTION="${1:-upgrade}"
 export APP_DIR API_DIR
 export GITEA_URL="${GITEA_URL:-}"
 export GITEA_OWNER="${GITEA_OWNER:-}"
-export GITEA_REPO="${GITEA_REPO:-myoffice-public}"
+export GITEA_REPO="${GITEA_REPO:-myoffice_public}"
 export RELEASE_TAG="${RELEASE_TAG:-latest}"
 export RELEASE_ASSET_URL="${RELEASE_ASSET_URL:-}"
 export GITEA_TOKEN="${GITEA_TOKEN:-}"