michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
LukePulverenti 2013-03-12 15:18:12 -04:00
commit 10879209ff
3 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
MediaBrowser.Installer/MainWindow.xaml.cs
View File

@ -249,6 +249,17 @@ namespace MediaBrowser.Installer
return; return;
} }
// Install Pismo
try
{
InstallPismo();
}
catch (Exception e)
{
SystemClose("Error Installing Pismo - "+e.GetType().FullName+"\n\n"+e.Message);
return;
}
// And run // And run
try try
{ {
@ -264,6 +275,17 @@ namespace MediaBrowser.Installer
} }
private void InstallPismo()
{
// Kick off the Pismo installer and wait for it to end
var pismo = new Process();
pismo.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
pismo.StartInfo.FileName = Path.Combine(RootPath, "Pismo", "pfminst.exe");
pismo.StartInfo.Arguments = "install";
pismo.Start();
pismo.WaitForExit();
}
protected async Task<PackageVersionInfo> GetPackageVersion() protected async Task<PackageVersionInfo> GetPackageVersion()
{ {
try try

5
MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
View File

@ -373,6 +373,8 @@
if $(ConfigurationName) == Release ( if $(ConfigurationName) == Release (
rmdir "$(SolutionDir)..\Deploy\Server\System" /s /q rmdir "$(SolutionDir)..\Deploy\Server\System" /s /q
mkdir "$(SolutionDir)..\Deploy\Server\System" mkdir "$(SolutionDir)..\Deploy\Server\System"
rmdir "$(SolutionDir)..\Deploy\Server\Pismo" /s /q
mkdir "$(SolutionDir)..\Deploy\Server\Pismo"
xcopy "$(TargetDir)$(TargetFileName)" "$(SolutionDir)..\Deploy\Server\System\" /y xcopy "$(TargetDir)$(TargetFileName)" "$(SolutionDir)..\Deploy\Server\System\" /y
xcopy "$(SolutionDir)Mediabrowser.Uninstaller\bin\Release\MediaBrowser.Uninstaller.exe.config" "$(SolutionDir)..\Deploy\Server\System\" /y xcopy "$(SolutionDir)Mediabrowser.Uninstaller\bin\Release\MediaBrowser.Uninstaller.exe.config" "$(SolutionDir)..\Deploy\Server\System\" /y
xcopy "$(SolutionDir)Mediabrowser.Uninstaller.Execute\bin\Release\MediaBrowser.Uninstaller.Execute.exe.config" "$(SolutionDir)..\Deploy\Server\System\" /y xcopy "$(SolutionDir)Mediabrowser.Uninstaller.Execute\bin\Release\MediaBrowser.Uninstaller.Execute.exe.config" "$(SolutionDir)..\Deploy\Server\System\" /y
@ -380,6 +382,9 @@ xcopy "$(SolutionDir)Mediabrowser.Uninstaller\bin\Release\MediaBrowser.Uninstall
xcopy "$(SolutionDir)Mediabrowser.Uninstaller.Execute\bin\Release\MediaBrowser.Uninstaller.Execute.exe" "$(SolutionDir)..\Deploy\Server\System\" /y xcopy "$(SolutionDir)Mediabrowser.Uninstaller.Execute\bin\Release\MediaBrowser.Uninstaller.Execute.exe" "$(SolutionDir)..\Deploy\Server\System\" /y
xcopy "$(SolutionDir)Mediabrowser.Installer\bin\Release\MediaBrowser.Installer.exe" "$(SolutionDir)..\Deploy\Server\System\" /y xcopy "$(SolutionDir)Mediabrowser.Installer\bin\Release\MediaBrowser.Installer.exe" "$(SolutionDir)..\Deploy\Server\System\" /y
//Pismo
"$(SolutionDir)ThirdParty\7zip\7za" x "$(SolutionDir)ThirdParty\Pismo-Install\pfm-168-mediabrowser-win.zip" -o"$(SolutionDir)..\Deploy\Server\Pismo\" -y
mkdir "$(SolutionDir)..\Deploy\Server\System\swagger-ui" mkdir "$(SolutionDir)..\Deploy\Server\System\swagger-ui"
xcopy "$(TargetDir)swagger-ui" "$(SolutionDir)..\Deploy\Server\System\swagger-ui" /y /s xcopy "$(TargetDir)swagger-ui" "$(SolutionDir)..\Deploy\Server\System\swagger-ui" /y /s

21
MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs
View File

@ -198,12 +198,33 @@ namespace MediaBrowser.Uninstaller.Execute
// Remove reference to us // Remove reference to us
RemoveUninstall(); RemoveUninstall();
// Remove pismo
try
{
UnInstallPismo();
}
catch
{
// No biggie - maybe they uninstalled it themselves
}
// and done // and done
lblHeading.Content = string.Format("Media Browser {0} Uninstalled.", Product); lblHeading.Content = string.Format("Media Browser {0} Uninstalled.", Product);
btnUninstall.Visibility = Visibility.Hidden; btnUninstall.Visibility = Visibility.Hidden;
btnFinished.Visibility = Visibility.Visible; btnFinished.Visibility = Visibility.Visible;
} }
private void UnInstallPismo()
{
// Kick off the Pismo uninstaller and wait for it to end
var pismo = new Process();
pismo.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
pismo.StartInfo.FileName = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), "pfm.exe");
pismo.StartInfo.Arguments = "uninstall pfm-license-mediabrowser.txt";
pismo.Start();
pismo.WaitForExit();
}
private void RemoveUninstall() private void RemoveUninstall()
{ {