NPOTB: Always use hl2sdk-proxy-repo in checkout-deps (#1236)

This commit is contained in:
peace-maker 2020-05-09 00:12:21 +02:00 committed by GitHub
parent 5ed2f79217
commit bc89e54f6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 5 deletions

View File

@ -47,16 +47,23 @@ Function Checkout-Repo
If ($Origin) If ($Origin)
{ {
Set-Location $Name Set-Location $Name
& git remote rm origin 2>&1 | Write-Host & git remote set-url origin $Origin 2>&1 | Write-Host
& git remote add origin $Origin 2>&1 | Write-Host
Set-Location .. Set-Location ..
} }
} }
Else Else
{ {
Set-Location $Name Set-Location $Name
If ($Origin)
{
& git remote set-url origin ..\$Repo 2>&1 | Write-Host
}
& git checkout $Branch 2>&1 | Write-Host & git checkout $Branch 2>&1 | Write-Host
& git pull origin $Branch 2>&1 | Write-Host & git pull origin $Branch 2>&1 | Write-Host
If ($Origin)
{
& git remote set-url origin $Origin 2>&1 | Write-Host
}
Set-Location .. Set-Location ..
} }
} }
@ -81,7 +88,7 @@ else
} }
$SDKS | % { $SDKS | % {
Checkout-Repo -Name "hl2sdk-$_" -Branch $_ "hl2sdk-proxy-repo" -Repo "https://github.com/alliedmodders/hl2sdk.git" Checkout-Repo -Name "hl2sdk-$_" -Branch $_ -Repo "hl2sdk-proxy-repo" "https://github.com/alliedmodders/hl2sdk.git"
} }
Checkout-Repo -Name "ambuild" -Branch "master" -Repo "https://github.com/alliedmodders/ambuild.git" Checkout-Repo -Name "ambuild" -Branch "master" -Repo "https://github.com/alliedmodders/ambuild.git"

View File

@ -74,14 +74,19 @@ checkout ()
git clone $repo -b $branch $name git clone $repo -b $branch $name
if [ -n "$origin" ]; then if [ -n "$origin" ]; then
cd $name cd $name
git remote rm origin git remote set-url origin $origin
git remote add origin $origin
cd .. cd ..
fi fi
else else
cd $name cd $name
if [ -n "$origin" ]; then
git remote set-url origin ../$repo
fi
git checkout $branch git checkout $branch
git pull origin $branch git pull origin $branch
if [ -n "$origin" ]; then
git remote set-url origin $origin
fi
cd .. cd ..
fi fi
} }