mirror of
https://github.com/sinbad/UEScripts.git
synced 2025-02-23 13:15:23 +00:00
Don't cleanup in build tool, do it in get latest before pull (and close editor earlier)
This commit is contained in:
parent
e670d33c44
commit
284d3e82ec
@ -104,17 +104,6 @@ try {
|
|||||||
throw "Build.bat missing at $buildbat : Aborting"
|
throw "Build.bat missing at $buildbat : Aborting"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Run cleanup tool
|
|
||||||
$cleanupargs = @()
|
|
||||||
if ($nocloseeditor) {
|
|
||||||
$cleanupargs += "-nocloseeditor"
|
|
||||||
}
|
|
||||||
if ($dryrun) {
|
|
||||||
$cleanupargs += "-dryrun"
|
|
||||||
}
|
|
||||||
# Use Invoke-Expression so we can use a string as options
|
|
||||||
Invoke-Expression "&'$PSScriptRoot/ue4-cleanup.ps1' $cleanupargs"
|
|
||||||
|
|
||||||
$buildargs = ""
|
$buildargs = ""
|
||||||
|
|
||||||
switch ($mode) {
|
switch ($mode) {
|
||||||
|
@ -69,6 +69,17 @@ try {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Run cleanup tool
|
||||||
|
$cleanupargs = @()
|
||||||
|
if ($nocloseeditor) {
|
||||||
|
$cleanupargs += "-nocloseeditor"
|
||||||
|
}
|
||||||
|
if ($dryrun) {
|
||||||
|
$cleanupargs += "-dryrun"
|
||||||
|
}
|
||||||
|
# Use Invoke-Expression so we can use a string as options
|
||||||
|
Invoke-Expression "&'$PSScriptRoot/ue4-cleanup.ps1' $cleanupargs"
|
||||||
|
|
||||||
# Use rebase pull to keep simpler
|
# Use rebase pull to keep simpler
|
||||||
Write-Output "Pulling latest from Git..."
|
Write-Output "Pulling latest from Git..."
|
||||||
git pull --rebase --recurse-submodules
|
git pull --rebase --recurse-submodules
|
||||||
|
Loading…
x
Reference in New Issue
Block a user