From e4aa1cdc982adab7f786d62cc59516ff6574fe8a Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Mon, 9 Jun 2025 07:38:33 -0500 Subject: [PATCH] Post-Local sync at 2025-06-09 07:38:32 --- .gitfield/push_log.json | 6 + .gitfield/pushed.log | 1 + bin/gitfield-codeberg | 261 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 268 insertions(+) create mode 100755 bin/gitfield-codeberg diff --git a/.gitfield/push_log.json b/.gitfield/push_log.json index 27db871..26f092c 100644 --- a/.gitfield/push_log.json +++ b/.gitfield/push_log.json @@ -176,6 +176,12 @@ "branch": "master", "commit": "d1bdac6f11d212a1bd25043d848dbf603577ab21", "message": "Post-GitHub sync at 2025-06-07 01:33:38" + }, + { + "timestamp": "2025-06-09 07:38:32", + "branch": "master", + "commit": "0832f90b05be3e7c58a76d9f63a05c179817a617", + "message": "Codeberg metadata link commit at 2025-06-09 07:35:30 — https://codeberg.org/mrhavens/git-sigil/commit/2f0763496109f75cab814d5e81aafc70cfc1f38e" } ] } diff --git a/.gitfield/pushed.log b/.gitfield/pushed.log index 79427ca..ac0dad2 100644 --- a/.gitfield/pushed.log +++ b/.gitfield/pushed.log @@ -160,3 +160,4 @@ [2025-06-07 01:41:15] Radicle: RID=rad:z3FEj7rF8gZw9eFksCuiN43qjzrex, Peer ID=z6Mkw5s3ppo26C7y7tGK5MD8n2GqTHS582PPpeX5Xqbu2Mpz CLI: rad inspect rad:z3FEj7rF8gZw9eFksCuiN43qjzrex # View project details CLI: git ls-tree -r --name-only HEAD # View file structure +[2025-06-09 07:38:33] Local: diff --git a/bin/gitfield-codeberg b/bin/gitfield-codeberg new file mode 100755 index 0000000..3bed6bc --- /dev/null +++ b/bin/gitfield-codeberg @@ -0,0 +1,261 @@ +#!/bin/bash +set -euo pipefail +IFS=$'\n\t' + +# Configuration +GIT_REMOTE_NAME="codeberg" +CODEBERG_DOMAIN="codeberg.org" +CODEBERG_SSH="git@$CODEBERG_DOMAIN" +CODEBERG_SSH_PORT="22" +CODEBERG_API="https://$CODEBERG_DOMAIN/api/v1" +USERNAME="mrhavens" +REPO_ROOT=$(git rev-parse --show-toplevel 2>/dev/null) || { echo "[ERROR] Not inside a git repository. Please run this script from within a git repository." >&2; exit 1; } +REPO_NAME=$(basename "$REPO_ROOT") || { echo "[ERROR] Failed to get repository name" >&2; exit 1; } +MARKDOWN_FILE="$REPO_ROOT/.gitfield/codeberg.sigil.md" +DEFAULT_NAME="Mark Randall Havens" +DEFAULT_EMAIL="mark.r.havens@gmail.com" +TOKEN_FILE="$HOME/.codeberg_token" +SCRIPT_VERSION="1.0" + +# Logging functions +info() { echo -e "\e[1;34m[INFO]\e[0m $*"; } +warn() { echo -e "\e[1;33m[WARN]\e[0m $*"; } +error() { echo -e "\e[1;31m[ERROR]\e[0m $*" >&2; exit 1; } + +# Check for required tools +info "Checking for required tools..." +for cmd in git curl jq ssh lsb_release; do + command -v "$cmd" >/dev/null || { + sudo apt update -qq || warn "Failed to update package lists, continuing..." + sudo apt install -y git curl jq openssh-client lsb-release || error "Failed to install $cmd" + } +done + +# Handle Codeberg token +RESET_TOKEN=false +if [[ "${1:-}" == "--reset-token" ]]; then + RESET_TOKEN=true + rm -f "$TOKEN_FILE" 2>/dev/null || warn "Failed to remove token file" + info "Token reset requested." +fi + +if [[ -f "$TOKEN_FILE" && "$RESET_TOKEN" == false ]]; then + TOKEN=$(cat "$TOKEN_FILE" 2>/dev/null) || error "Failed to read token from $TOKEN_FILE" + info "Using cached token from $TOKEN_FILE" +else + echo "šŸ” Paste your Codeberg Personal Access Token (scopes: write:repository, write:ssh_key)" + echo "→ Generate at: $CODEBERG_DOMAIN/settings/tokens" + read -rsp "Token: " TOKEN + echo + [[ -z "$TOKEN" ]] && error "Token cannot be empty" + echo "$TOKEN" > "$TOKEN_FILE" || error "Failed to write token to $TOKEN_FILE" + chmod 600 "$TOKEN_FILE" || error "Failed to set permissions on $TOKEN_FILE" + info "Token saved at $TOKEN_FILE" +fi + +# Set git user info +git config --global user.name "$DEFAULT_NAME" || warn "Failed to set git user name" +git config --global user.email "$DEFAULT_EMAIL" || warn "Failed to set git user email" +info "Git identity set to: $DEFAULT_NAME <$DEFAULT_EMAIL>" + +# Ensure at least one commit exists +if ! git rev-parse HEAD &>/dev/null; then + error "No commits found in the repository. Please add and commit files before running this script." +fi + +# SSH setup with default port (22 for Codeberg) +if [[ ! -f "$HOME/.ssh/id_ed25519" ]]; then + info "Generating SSH key..." + ssh-keygen -t ed25519 -C "$DEFAULT_EMAIL" -f "$HOME/.ssh/id_ed25519" -N "" || error "Failed to generate SSH key" +fi + +eval "$(ssh-agent -s)" >/dev/null 2>&1 || error "Failed to start ssh-agent" +ssh-add "$HOME/.ssh/id_ed25519" >/dev/null 2>&1 || warn "SSH key already added or could not be added" + +# Configure SSH for Codeberg +SSH_CONFIG_FILE="$HOME/.ssh/config" +if ! grep -q "Host $CODEBERG_DOMAIN" "$SSH_CONFIG_FILE" 2>/dev/null; then + mkdir -p "$HOME/.ssh" && chmod 700 "$HOME/.ssh" + cat >> "$SSH_CONFIG_FILE" <&1) +if ! echo "$SSH_TEST_OUTPUT" | grep -q "successfully authenticated"; then + warn "SSH test failed, attempting to upload SSH key. Output: $SSH_TEST_OUTPUT" + PUBKEY=$(cat "$HOME/.ssh/id_ed25519.pub" 2>/dev/null) || error "Failed to read SSH public key" + TITLE="AutoKey-$(hostname)-$(date +%s 2>/dev/null || echo 'unknown')" + CURL_OUTPUT=$(curl -s --fail -X POST "$CODEBERG_API/user/keys" \ + -H "Authorization: token $TOKEN" \ + -H "Content-Type: application/json" \ + -d "{\"title\": \"$TITLE\", \"key\": \"$PUBKEY\", \"read_only\": false}" 2>&1) + if [[ $? -ne 0 ]]; then + warn "SSH key upload failed: $CURL_OUTPUT" + else + info "SSH key uploaded successfully." + sleep 2 + SSH_TEST_OUTPUT=$(ssh -T -p "$CODEBERG_SSH_PORT" "$CODEBERG_SSH" 2>&1) + if ! echo "$SSH_TEST_OUTPUT" | grep -q "successfully authenticated"; then + warn "SSH test still failing after key upload. Output: $SSH_TEST_OUTPUT" + else + info "SSH test passed after key upload." + fi + fi +else + info "SSH test passed: $SSH_TEST_OUTPUT" +fi +set -e + +# Check and create Codeberg repository +info "Checking if repository exists..." +EXISTS=$(curl -s -H "Authorization: token $TOKEN" "$CODEBERG_API/repos/$USERNAME/$REPO_NAME" | jq -r .name 2>/dev/null || echo "") +if [[ "$EXISTS" != "$REPO_NAME" ]]; then + info "Creating repository $REPO_NAME on Codeberg..." + CURL_OUTPUT=$(curl -s --fail -X POST "$CODEBERG_API/user/repos" \ + -H "Authorization: token $TOKEN" \ + -H "Content-Type: application/json" \ + -d "{\"name\": \"$REPO_NAME\", \"description\": \"Created via gitfield-codeberg\", \"private\": false}" 2>&1) || { + warn "Failed to create repository: $CURL_OUTPUT" + error "Repository creation failed. Check token permissions or network." + } + info "Repository created successfully." +fi + +# Set up git remote +REMOTE_URL="$CODEBERG_SSH:$USERNAME/$REPO_NAME.git" +if ! git remote get-url "$GIT_REMOTE_NAME" &>/dev/null; then + info "Adding remote $GIT_REMOTE_NAME..." + git remote add "$GIT_REMOTE_NAME" "$REMOTE_URL" || error "Failed to add remote $GIT_REMOTE_NAME" +else + info "Updating remote $GIT_REMOTE_NAME..." + git remote set-url "$GIT_REMOTE_NAME" "$REMOTE_URL" || error "Failed to set remote URL for $GIT_REMOTE_NAME" +fi + +# Generate metadata file +mkdir -p "$(dirname "$MARKDOWN_FILE")" || error "Failed to create directory for $MARKDOWN_FILE" + +TIMESTAMP=$(date '+%Y-%m-%d %H:%M:%S') || error "Failed to get timestamp" +DEFAULT_BRANCH=$(git symbolic-ref --short HEAD) || error "Failed to get default branch" +REPO_PATH="$REPO_ROOT" +LATEST_SHA=$(git rev-parse HEAD) || error "Failed to get latest commit SHA" +LAST_COMMIT_MSG=$(git log -1 --pretty=format:"%s" 2>/dev/null || echo "Unknown") +LAST_COMMIT_DATE=$(git log -1 --pretty=format:"%ad" 2>/dev/null || echo "Unknown") +LAST_COMMIT_AUTHOR=$(git log -1 --pretty=format:"%an <%ae>" 2>/dev/null || echo "Unknown") +TOTAL_COMMITS=$(git rev-list --count HEAD 2>/dev/null || echo "Unknown") +TRACKED_FILES=$(git ls-files 2>/dev/null | wc -l 2>/dev/null || echo "Unknown") +UNCOMMITTED=$(if ! git diff --quiet 2>/dev/null || ! git diff --cached --quiet 2>/dev/null; then echo "Yes"; else echo "No"; fi) +LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "None") +HOSTNAME=$(hostname 2>/dev/null || echo "Unknown") +CURRENT_USER=$(whoami 2>/dev/null || echo "Unknown") +TIMEZONE=$(date +%Z 2>/dev/null || echo "Unknown") +OS_NAME=$(uname -s 2>/dev/null || echo "Unknown") +KERNEL_VERSION=$(uname -r 2>/dev/null || echo "Unknown") +ARCHITECTURE=$(uname -m 2>/dev/null || echo "Unknown") +OS_PRETTY_NAME=$(grep PRETTY_NAME /etc/os-release 2>/dev/null | cut -d= -f2 | tr -d '"' || echo "Unknown") +DOCKER_CHECK=$(grep -qE '/docker|/lxc' /proc/1/cgroup 2>/dev/null && echo "Yes" || echo "No") +WSL_CHECK=$(grep -qi microsoft /proc/version 2>/dev/null && echo "Yes" || echo "No") +VM_CHECK=$(systemd-detect-virt 2>/dev/null || echo "Unknown") +UPTIME=$(uptime -p 2>/dev/null || echo "Unknown") +MAC_ADDR=$(ip link 2>/dev/null | awk '/ether/ {print $2}' | head -n 1 2>/dev/null || echo "Unknown") +LOCAL_IP=$(hostname -I 2>/dev/null | awk '{print $1}' 2>/dev/null || echo "Unknown") +CPU_MODEL=$(grep -m1 'model name' /proc/cpuinfo 2>/dev/null | cut -d: -f2 | sed 's/^ //' 2>/dev/null || echo "Unknown") +RAM_GB=$(awk '/MemTotal/ {printf "%.2f", $2/1024/1024}' /proc/meminfo 2>/dev/null || echo "Unknown") +WEB_LINK="https://$CODEBERG_DOMAIN/$USERNAME/$REPO_NAME" + +cat > "$MARKDOWN_FILE" </dev/null; then + git push -u "$GIT_REMOTE_NAME" "$DEFAULT_BRANCH" || { + warn "Push to Codeberg failed. Check SSH setup or network." + warn "Run 'ssh -T -p $CODEBERG_SSH_PORT git@$CODEBERG_DOMAIN' to debug." + } +else + git push "$GIT_REMOTE_NAME" "$DEFAULT_BRANCH" || { + warn "Push to Codeberg failed. Check SSH setup or network." + warn "Run 'ssh -T -p $CODEBERG_SSH_PORT git@$CODEBERG_DOMAIN' to debug." + } +fi +set -e + +info "āœ… Codeberg push complete." +echo -e "\nšŸ”— View in browser: $WEB_LINK\n"