Update autocommit.sh

autocommit.sh

@@ -1,49 +1,55 @@
 #!/bin/bash
+set -e  # 遇到错误立即停止
+
+# ========== 配置 ==========
+WORKSPACE="/home/cpp_competition"          # 你的开发目录（只读源）
+BACKUP_DIR="/tmp/git_backup_$(date +%s)"   # 临时备份目录
+# 注意：这里使用干净URL，依赖全局凭证
+REPO_URL="https://github.com/$(cat /run/secrets/GH_USERNAME)/$(cat /run/secrets/REPO_NAME).git"
+BRANCH_BACKUP="auto-backup"
+
+# ========== 在隔离环境备份 ==========
+echo "[$(date)] Starting isolated backup..."
+
+# 1. 克隆仓库到临时目录
+# 优先尝试克隆备份分支，如果不存在则克隆主分支
+if git clone --depth 1 --branch "$BRANCH_BACKUP" "$REPO_URL" "$BACKUP_DIR" 2>/dev/null; then
+    echo "Cloned existing $BRANCH_BACKUP branch."
+else
+    echo "Backup branch not found, cloning main branch."
+    git clone --depth 1 --branch "main" "$REPO_URL" "$BACKUP_DIR"
+fi
+
+cd "$BACKUP_DIR"
 
-# 进入你的代码仓库目录
-cd /home/cpp_competition || exit 1
+# 2. 确保在备份分支上
+git checkout -b "$BRANCH_BACKUP" 2>/dev/null || git checkout "$BRANCH_BACKUP"
 
-# 2. 定义分支名称
-TARGET_BRANCH="auto-backup"  # 专门用于自动提交的分支
-BASE_BRANCH="main"           # 基准分支，完成后切换回来
+# 3. 将工作目录的文件同步过来（排除.git目录）
+echo "Syncing files from workspace..."
+rsync -av --delete --exclude='.git/' "$WORKSPACE/" ./
 
-# 3. 检查是否有文件变动
+# 4. 检查、提交、推送
 if [[ -n $(git status --porcelain) ]]; then
-    echo "[$(date)] Changes detected. Starting auto-commit process..."
-
-    # 4. 确保位于基准分支，并获取最新代码（可选，避免冲突）
-    git checkout $BASE_BRANCH
-    git pull origin $BASE_BRANCH
-
-    # 5. 创建或切换到目标分支
-    # 检查目标分支是否存在（本地或远程）
-    if ! git show-ref --verify --quiet refs/heads/$TARGET_BRANCH; then
-        # 本地不存在，尝试从远程拉取
-        if git fetch origin $TARGET_BRANCH 2>/dev/null; then
-            git checkout -b $TARGET_BRANCH origin/$TARGET_BRANCH
-        else
-            # 远程也不存在，基于当前基准分支创建新分支
-            git checkout -b $TARGET_BRANCH
-        fi
+    # 设置本次提交的作者信息（可自定义）
+    git config user.email "backup@system"
+    git config user.name "Backup Bot"
+    
+    git add -A
+    git commit -m "Backup: $(date '+%Y-%m-%d %H:%M:%S')"
+    
+    # 推送时将使用全局配置的凭证
+    if git push origin "$BRANCH_BACKUP"; then
+        echo "[$(date)] Backup succeeded to $BRANCH_BACKUP."
     else
-        # 目标分支已存在，切换过去
-        git checkout $TARGET_BRANCH
-        # 合并基准分支的最新更改（保持备份分支同步）
-        git merge $BASE_BRANCH --no-commit 2>/dev/null || true
+        echo "[$(date)] ERROR: Push failed. Check your credentials." >&2
+        exit 1
     fi
-
-    # 6. 添加所有更改并提交
-    git add .
-    git commit -m "Auto-commit: $(date '+%Y-%m-%d %H:%M:%S')"
-
-    # 7. 推送到远程的目标分支
-    git push origin $TARGET_BRANCH
-    echo "[$(date)] Auto-commit pushed to branch: $TARGET_BRANCH"
-
-    # 8. 切换回基准分支
-    git checkout $BASE_BRANCH
-    echo "[$(date)] Switched back to branch: $BASE_BRANCH"
-
 else
-    echo "[$(date)] No changes to commit. Staying on current branch."
-fi
+    echo "[$(date)] No changes to backup."
+fi
+
+# 5. 清理临时目录
+cd /
+rm -rf "$BACKUP_DIR"
+echo "[$(date)] Backup process completed."