Compare commits

..

No commits in common. "498eeaa0efc6e0a22f93a823f4b8e51f29709593" and "6502dde28045a3b8c6be2f3e952d6c7c3edf832c" have entirely different histories.

2 changed files with 8 additions and 19 deletions

View File

@ -5,18 +5,16 @@
Clear-Host Clear-Host
Write-Host "Stopping installer ... " -ForegroundColor cyan -NoNewLine Write-Host "Stopping installer ..."
$installer = Stop-Process -Name "SPTInstaller" -ErrorAction SilentlyContinue $installer = Stop-Process -Name "SPTInstaller" -ErrorAction SilentlyContinue
if ($installer -ne $null) if ($installer -ne $null)
{ {
Write-Warning "Something went wrong, couldn't stop installer process'" Write-Host "Something went wrong, couldn't stop installer process'"
return; return;
} }
Write-Host "OK" -ForegroundColor green
if (-not(Test-Path $source) -and -not(Test-Path $destination)) { if (-not(Test-Path $source) -and -not(Test-Path $destination)) {
Write-Warning "Can't find a required file" Write-Warning "Can't find a required file"
Write-host "" Write-host ""
@ -25,7 +23,7 @@ if (-not(Test-Path $source) -and -not(Test-Path $destination)) {
exit exit
} }
Write-Host "Copying new installer ... " -ForegroundColor cyan Write-Host "Copying new installer ..."
$maxAttempts = 10 $maxAttempts = 10
$copied = $false $copied = $false
@ -34,7 +32,7 @@ while (-not $copied) {
$maxAttempts-- $maxAttempts--
Write-Host " > Please wait ... " -NoNewLine Write-Host "Please wait ..."
if ($maxAttempts -le 0) { if ($maxAttempts -le 0) {
Write-Host "Couldn't copy new installer :( Please re-download the installer" Write-Host "Couldn't copy new installer :( Please re-download the installer"
@ -44,15 +42,8 @@ while (-not $copied) {
exit exit
} }
try { Remove-Item $destination -ErrorAction SilentlyContinue
Remove-Item $destination -ErrorAction SilentlyContinue Copy-Item $source $destination -ErrorAction SilentlyContinue
Copy-Item $source $destination -ErrorAction SilentlyContinue
}
catch {
Write-Host "file locked, retrying ..." -ForegroundColor yellow
sleep(2)
continue
}
if (Test-Path $destination) { if (Test-Path $destination) {
$sLength = (Get-Item $source).Length $sLength = (Get-Item $source).Length
@ -60,11 +51,9 @@ while (-not $copied) {
if ($sLength -eq $dLength) { if ($sLength -eq $dLength) {
$copied = $true $copied = $true
Write-Host "OK" -ForegroundColor green
break break
} }
Write-Host "sizes differ, retrying ..." -ForegroundColor yellow
sleep(2) sleep(2)
} }
} }

View File

@ -10,8 +10,8 @@
<PackageIcon>icon.ico</PackageIcon> <PackageIcon>icon.ico</PackageIcon>
<ApplicationIcon>Assets\spt_installer.ico</ApplicationIcon> <ApplicationIcon>Assets\spt_installer.ico</ApplicationIcon>
<Configurations>Debug;Release;TEST</Configurations> <Configurations>Debug;Release;TEST</Configurations>
<AssemblyVersion>2.85</AssemblyVersion> <AssemblyVersion>2.84</AssemblyVersion>
<FileVersion>2.85</FileVersion> <FileVersion>2.84</FileVersion>
<Company>SPT</Company> <Company>SPT</Company>
</PropertyGroup> </PropertyGroup>