diff --git a/third_party/init.bash b/third_party/init.bash index c1149eb..20d8374 100644 --- a/third_party/init.bash +++ b/third_party/init.bash @@ -1,8 +1,10 @@ #!/usr/bin/env bash set -euo pipefail - root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" cd "$root" +origin="$(git remote get-url origin)" +origin="${origin%/}" +remote_root="$(printf '%s\n' "$origin" | sed -E 's#/[^/]+(\.git)?$##')" fetch_repo() { local repo="$1" local branch="$2" @@ -17,14 +19,12 @@ fetch_repo() { git clone --branch "$branch" --single-branch "$repo" "$dir" fi } - fetch_repo_ex() { local name="$1" - repo="http://192.168.1.75:3000/psc/${name}" - branch="master" - fetch_repo "${repo}" "$branch" "third_party/${name}" + local repo="${remote_root}/${name}" + local branch="master" + fetch_repo "$repo" "$branch" "third_party/${name}" } - fetch_repo_ex "build_infra" fetch_repo_ex "CPP_Core" -fetch_repo_ex "SSR" +fetch_repo_ex "SSR" \ No newline at end of file diff --git a/third_party/init.ps1 b/third_party/init.ps1 index 4e065f7..9e555e9 100644 --- a/third_party/init.ps1 +++ b/third_party/init.ps1 @@ -6,6 +6,9 @@ if ( [string]::IsNullOrWhiteSpace($scriptDir)) } $root = (Resolve-Path -LiteralPath (Join-Path $scriptDir "..")).Path Set-Location -LiteralPath $root +$origin = git remote get-url origin +$origin = $origin.TrimEnd("/") +$remoteRoot = $origin -replace "/[^/]+(\.git)?$", "" function Fetch-Repo { param( @@ -31,7 +34,7 @@ function Fetch-RepoEx param( [string]$Name ) - $repo = "http://10.10.10.1:3000/ae/$Name" + $repo = "$remoteRoot/$Name" $branch = "master" Fetch-Repo -Repo $repo -Branch $branch -Dir "third_party/$Name" }