diff --git a/.vscode/settings.example.json b/.vscode/settings.example.json index 2f289159..0410df03 100644 --- a/.vscode/settings.example.json +++ b/.vscode/settings.example.json @@ -1,10 +1,10 @@ { "yaml.schemas": { - "https://github.com/yusing/go-proxy/raw/v0.9/schemas/config.schema.json": [ + "https://github.com/yusing/go-proxy/raw/main/schemas/config.schema.json": [ "config.example.yml", "config.yml" ], - "https://github.com/yusing/go-proxy/raw/v0.9/schemas/routes.schema.json": [ + "https://github.com/yusing/go-proxy/raw/main/schemas/routes.schema.json": [ "providers.example.yml" ] } diff --git a/README.md b/README.md index 71d2eb83..4dd33f56 100755 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ Setup DNS Records point to machine which runs `GoDoxy`, e.g. 2. Run setup script inside the directory, or [set up manually](#manual-setup) ```shell - /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/yusing/go-proxy/v0.9/scripts/setup.sh)" + /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/yusing/go-proxy/main/scripts/setup.sh)" ``` 3. Start the container `docker compose up -d` and wait for it to be ready @@ -88,15 +88,15 @@ Setup DNS Records point to machine which runs `GoDoxy`, e.g. 1. Make `config` directory then grab `config.example.yml` into `config/config.yml` - `mkdir -p config && wget https://raw.githubusercontent.com/yusing/go-proxy/v0.9/config.example.yml -O config/config.yml` + `mkdir -p config && wget https://raw.githubusercontent.com/yusing/go-proxy/main/config.example.yml -O config/config.yml` 2. Grab `.env.example` into `.env` - `wget https://raw.githubusercontent.com/yusing/go-proxy/v0.9/.env.example -O .env` + `wget https://raw.githubusercontent.com/yusing/go-proxy/main/.env.example -O .env` 3. Grab `compose.example.yml` into `compose.yml` - `wget https://raw.githubusercontent.com/yusing/go-proxy/v0.9/compose.example.yml -O compose.yml` + `wget https://raw.githubusercontent.com/yusing/go-proxy/main/compose.example.yml -O compose.yml` ### Folder structrue diff --git a/README_CHT.md b/README_CHT.md index d997221f..a3613c6c 100644 --- a/README_CHT.md +++ b/README_CHT.md @@ -73,7 +73,7 @@ 2. 在目錄內運行安裝腳本,或[手動安裝](#手動安裝) ```shell - /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/yusing/go-proxy/v0.9/scripts/setup.sh)" + /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/yusing/go-proxy/main/scripts/setup.sh)" ``` 3. 啟動容器 `docker compose up -d` 並等待就緒 @@ -86,15 +86,15 @@ 1. 建立 `config` 目錄,然後將 `config.example.yml` 下載到 `config/config.yml` - `mkdir -p config && wget https://raw.githubusercontent.com/yusing/go-proxy/v0.9/config.example.yml -O config/config.yml` + `mkdir -p config && wget https://raw.githubusercontent.com/yusing/go-proxy/main/config.example.yml -O config/config.yml` 2. 將 `.env.example` 下載到 `.env` - `wget https://raw.githubusercontent.com/yusing/go-proxy/v0.9/.env.example -O .env` + `wget https://raw.githubusercontent.com/yusing/go-proxy/main/.env.example -O .env` 3. 將 `compose.example.yml` 下載到 `compose.yml` - `wget https://raw.githubusercontent.com/yusing/go-proxy/v0.9/compose.example.yml -O compose.yml` + `wget https://raw.githubusercontent.com/yusing/go-proxy/main/compose.example.yml -O compose.yml` ### 資料夾結構 diff --git a/scripts/setup.sh b/scripts/setup.sh index d30b664a..12c58c14 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -21,26 +21,26 @@ fi echo "Using ${DOWNLOAD_TOOL} for downloads" -get_default_branch() { - local repo="$1" # Format: owner/repo - local branch +# get_default_branch() { +# local repo="$1" # Format: owner/repo +# local branch - if [ "$DOWNLOAD_TOOL" = "curl" ]; then - branch=$(curl -sL "https://api.github.com/repos/${repo}" | grep -o '"default_branch": *"[^"]*"' | cut -d'"' -f4) - elif [ "$DOWNLOAD_TOOL" = "wget" ]; then - branch=$(wget -qO- "https://api.github.com/repos/${repo}" | grep -o '"default_branch": *"[^"]*"' | cut -d'"' -f4) - fi +# if [ "$DOWNLOAD_TOOL" = "curl" ]; then +# branch=$(curl -sL "https://api.github.com/repos/${repo}" | grep -o '"default_branch": *"[^"]*"' | cut -d'"' -f4) +# elif [ "$DOWNLOAD_TOOL" = "wget" ]; then +# branch=$(wget -qO- "https://api.github.com/repos/${repo}" | grep -o '"default_branch": *"[^"]*"' | cut -d'"' -f4) +# fi - if [ -z "$branch" ]; then - echo "main" # Fallback to 'main' if detection fails - else - echo "$branch" - fi -} +# if [ -z "$branch" ]; then +# echo "main" # Fallback to 'main' if detection fails +# else +# echo "$branch" +# fi +# } # Environment variables with defaults REPO="yusing/go-proxy" -BRANCH=${BRANCH:-$(get_default_branch "$REPO")} +BRANCH=${BRANCH:-"main"} REPO_URL="https://github.com/$REPO" WIKI_URL="${REPO_URL}/wiki" BASE_URL="${REPO_URL}/raw/${BRANCH}"