From 7c6dc585798ada6168199705cf8253330a018211 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 23 Mar 2026 15:14:46 +0800 Subject: [PATCH] Sync subset from blackmatrix7/ios_rule_script --- .gitignore | 1 + scripts/sync_subset.sh | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9bc0b93..be32080 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .sync.log +.sync.env diff --git a/scripts/sync_subset.sh b/scripts/sync_subset.sh index 7796616..0e153f4 100755 --- a/scripts/sync_subset.sh +++ b/scripts/sync_subset.sh @@ -5,6 +5,7 @@ ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" SURGE_DIR="$ROOT_DIR/rule/Surge" UPSTREAM_BASE="https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Surge" GITEA_ENV_FILE="$ROOT_DIR/../gitea/.env" +LOCAL_SYNC_ENV_FILE="$ROOT_DIR/.sync.env" if [[ ! -f "$GITEA_ENV_FILE" ]]; then echo "missing Gitea env file: $GITEA_ENV_FILE" >&2 @@ -13,9 +14,15 @@ fi source "$GITEA_ENV_FILE" +if [[ -f "$LOCAL_SYNC_ENV_FILE" ]]; then + source "$LOCAL_SYNC_ENV_FILE" +fi + GITEA_REPO_OWNER="${GITEA_REPO_OWNER:-admin}" GITEA_REPO_NAME="${GITEA_REPO_NAME:-ios-rule-script-subset}" -GITEA_REMOTE_URL="https://${GITEA_ADMIN_USERNAME}:${GITEA_ADMIN_PASSWORD}@git.halonice.com/${GITEA_REPO_OWNER}/${GITEA_REPO_NAME}.git" +GITEA_SYNC_USERNAME="${GITEA_SYNC_USERNAME:-$GITEA_ADMIN_USERNAME}" +GITEA_SYNC_PASSWORD="${GITEA_SYNC_PASSWORD:-${GITEA_SYNC_TOKEN:-$GITEA_ADMIN_PASSWORD}}" +GITEA_REMOTE_URL="https://${GITEA_SYNC_USERNAME}:${GITEA_SYNC_PASSWORD}@git.halonice.com/${GITEA_REPO_OWNER}/${GITEA_REPO_NAME}.git" mkdir -p "$SURGE_DIR" @@ -40,6 +47,8 @@ cd "$ROOT_DIR" if [[ ! -d .git ]]; then git init -b main >/dev/null git remote add origin "$GITEA_REMOTE_URL" +else + git remote set-url origin "$GITEA_REMOTE_URL" fi git add README.md .gitignore scripts/sync_subset.sh rule/Surge