aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcrankdoofus <52436708+crankdoofus@users.noreply.github.com>2019-07-06 12:16:34 +1000
committerGitHub <noreply@github.com>2019-07-06 12:16:34 +1000
commit43989800baa4e147a67c4b278e05face3ceadb5f (patch)
tree32743c32db4c17b73b124d3d8f77d5915f69b03c
parent1fd827fa775e706704ef976f5b8d179416df41a6 (diff)
Added -Force to nsis extraction
-rw-r--r--deployment/windows/build-jellyfin.ps15
1 files changed, 3 insertions, 2 deletions
diff --git a/deployment/windows/build-jellyfin.ps1 b/deployment/windows/build-jellyfin.ps1
index bac907047..0cfd78dfa 100644
--- a/deployment/windows/build-jellyfin.ps1
+++ b/deployment/windows/build-jellyfin.ps1
@@ -30,7 +30,7 @@ function Build-JellyFin {
Write-Verbose "windowsversion-Architecture: $windowsversion-$Architecture"
Write-Verbose "InstallLocation: $InstallLocation"
Write-Verbose "DotNetVerbosity: $DotNetVerbosity"
- dotnet publish -c $BuildType -r `"$windowsversion-$Architecture`" MediaBrowser.sln -o $InstallLocation -v $DotNetVerbosity
+# dotnet publish -c $BuildType -r `"$windowsversion-$Architecture`" MediaBrowser.sln -o $InstallLocation -v $DotNetVerbosity
}
function Install-FFMPEG {
@@ -105,7 +105,7 @@ function Make-NSIS {
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
Invoke-WebRequest -Uri https://nchc.dl.sourceforge.net/project/nsis/NSIS%203/3.04/nsis-3.04.zip -UseBasicParsing -OutFile "$tempdir/nsis.zip" | Write-Verbose
- Expand-Archive "$tempdir/nsis.zip" -DestinationPath "$tempdir/nsis/" | Write-Verbose
+ Expand-Archive "$tempdir/nsis.zip" -DestinationPath "$tempdir/nsis/" -Force | Write-Verbose
$env:InstallLocation = $InstallLocation
& "$tempdir/nsis/nsis-3.04/makensis.exe" ".\deployment\windows\jellyfin.nsi"
Copy-Item .\deployment\windows\Jellyfin.Installer.*.exe $InstallLocation\..\
@@ -114,6 +114,7 @@ function Make-NSIS {
Remove-Item "$tempdir/nsis.zip" -Force -ErrorAction Continue | Write-Verbose
}
+
Write-Verbose "Starting Build Process: Selected Environment is $WindowsVersion-$Architecture"
Build-JellyFin
if($InstallFFMPEG.IsPresent -or ($InstallFFMPEG -eq $true)){