mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-26 15:38:39 +02:00
Added -Force to nsis extraction
This commit is contained in:
parent
1fd827fa77
commit
43989800ba
|
@ -30,7 +30,7 @@ function Build-JellyFin {
|
||||||
Write-Verbose "windowsversion-Architecture: $windowsversion-$Architecture"
|
Write-Verbose "windowsversion-Architecture: $windowsversion-$Architecture"
|
||||||
Write-Verbose "InstallLocation: $InstallLocation"
|
Write-Verbose "InstallLocation: $InstallLocation"
|
||||||
Write-Verbose "DotNetVerbosity: $DotNetVerbosity"
|
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 {
|
function Install-FFMPEG {
|
||||||
|
@ -105,7 +105,7 @@ function Make-NSIS {
|
||||||
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
|
[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
|
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
|
$env:InstallLocation = $InstallLocation
|
||||||
& "$tempdir/nsis/nsis-3.04/makensis.exe" ".\deployment\windows\jellyfin.nsi"
|
& "$tempdir/nsis/nsis-3.04/makensis.exe" ".\deployment\windows\jellyfin.nsi"
|
||||||
Copy-Item .\deployment\windows\Jellyfin.Installer.*.exe $InstallLocation\..\
|
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
|
Remove-Item "$tempdir/nsis.zip" -Force -ErrorAction Continue | Write-Verbose
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Write-Verbose "Starting Build Process: Selected Environment is $WindowsVersion-$Architecture"
|
Write-Verbose "Starting Build Process: Selected Environment is $WindowsVersion-$Architecture"
|
||||||
Build-JellyFin
|
Build-JellyFin
|
||||||
if($InstallFFMPEG.IsPresent -or ($InstallFFMPEG -eq $true)){
|
if($InstallFFMPEG.IsPresent -or ($InstallFFMPEG -eq $true)){
|
||||||
|
|
Loading…
Reference in a new issue