From 173822a6657dd2df5b2c3d4bc57b8c886c5d6832 Mon Sep 17 00:00:00 2001
From: oib <andreas.fleckl@chello.at>
Date: Sat, 12 Apr 2025 10:50:18 +0200
Subject: [PATCH] Update 2025-04-12_10:50:18

---
 gitea_push.sh | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/gitea_push.sh b/gitea_push.sh
index 2b78169..619395e 100755
--- a/gitea_push.sh
+++ b/gitea_push.sh
@@ -10,9 +10,19 @@ if [ -z "$GITEA_API_TOKEN" ] && grep -q '^GITEA_API_TOKEN=' ~/.netrc 2>/dev/null
   GITEA_API_TOKEN=$(grep '^GITEA_API_TOKEN=' ~/.netrc | head -n1 | cut -d= -f2 | xargs)
   export GITEA_API_TOKEN
 fi
-GITEA_USER="oib"
-GITEA_URL="https://gitea.bubuit.net"
+if grep -q 'login ' ~/.netrc 2>/dev/null; then
+GITEA_USER=$(awk '{for(i=1;i<=NF;i++) if($i=="login") print $(i+1)}' ~/.netrc | head -n1)
+if [ -z "$GITEA_USER" ]; then
+  log ERROR "No login found in ~/.netrc"
+  exit 1
+fi
+GITEA_URL="https://$(awk '{for(i=1;i<=NF;i++) if($i=="machine") print $(i+1)}' ~/.netrc | head -n1)"
+if [ -z "$GITEA_URL" ]; then
+  log ERROR "No URL found in ~/.netrc"
+  exit 1
+fi
 GITEA_API_URL="$GITEA_URL/api/v1"
+fi
 PRIVATE=false
 DEBUG=false
 COMMIT_MESSAGE="Update $(date +%F_%T)"
@@ -132,11 +142,10 @@ fi
 
 HOST_GROUP=$(echo "$1" | tr '[:upper:]' '[:lower:]' | tr -cd 'a-z0-9-')
 HOST_NAME=$(hostname -s | tr '[:upper:]' '[:lower:]' | tr -cd 'a-z0-9-')
-HOST_NAME=$(hostname -s | tr '[:upper:]' '[:lower:]' | tr -cd 'a-z0-9-')
 FOLDER_NAME="${HOST_NAME}-$(basename "$PWD")"
 REPO_PATH="$PWD"
 REMOTE_PATH="$FOLDER_NAME"
-GIT_REMOTE="https://gitea.bubuit.net/$GITEA_USER/$FOLDER_NAME.git"
+GIT_REMOTE="$GITEA_URL/$GITEA_USER/$FOLDER_NAME.git"
 
 # Git authentication hint
 # export GIT_ASKPASS=true  # disabled: does not affect authentication without handler