From: sr55 <sr55.hb@outlook.com>
Date: Sun, 26 Mar 2017 11:19:05 +0000 (+0100)
Subject: WinGui: Remove fonts directory from installer.
X-Git-Tag: 1.1.0~618
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9fe38b50b8f45e63e76fb4574778d17f7f1e92fe;p=handbrake

WinGui: Remove fonts directory from installer.
---

diff --git a/win/CS/HandBrakeWPF/Installer/Installer.nsi b/win/CS/HandBrakeWPF/Installer/Installer.nsi
index c46c5c965..39149d30c 100644
--- a/win/CS/HandBrakeWPF/Installer/Installer.nsi
+++ b/win/CS/HandBrakeWPF/Installer/Installer.nsi
@@ -148,11 +148,6 @@ Section "HandBrake" SEC01
   SetOutPath "$INSTDIR\doc"
   SetOverwrite ifnewer
   File "doc\*.*"
-
-  ; Copy the standard fonts config set into the fonts folder
-  SetOutPath "$INSTDIR\fonts"
-  SetOverwrite ifnewer
-  File /r "fonts\*.*"
 SectionEnd
 
 Section -AdditionalIcons
@@ -189,13 +184,7 @@ Section Uninstall
   
   Delete "$INSTDIR\*.*"
   Delete "$INSTDIR\doc\*.*"
-  Delete "$INSTDIR\fonts\*.*"
-  Delete "$INSTDIR\fonts\conf.d\*.*"
-  Delete "$INSTDIR\fonts\conf.avail\*.*"
   RMDir  "$INSTDIR\doc"
-  RMDIR  "$INSTDIR\fonts\conf.d"
-  RMDIR  "$INSTDIR\fonts\conf.avail"
-  RMDIR  "$INSTDIR\fonts"
   Delete "$SMPROGRAMS\HandBrake\Uninstall.lnk"
   Delete "$DESKTOP\HandBrake.lnk"
   Delete "$SMPROGRAMS\HandBrake\HandBrake.lnk"
diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
index 221ef9cd2..1b42902f1 100644
--- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
@@ -148,12 +148,6 @@ Section "HandBrake" SEC01
   SetOutPath "$INSTDIR\doc"
   SetOverwrite ifnewer
   File "doc\*.*"
-
-  ; Copy the standard fonts config set into the fonts folder
-  SetOutPath "$INSTDIR\fonts"
-  SetOverwrite ifnewer
-  File /r "fonts\*.*"
-
   
 SectionEnd
 
@@ -191,13 +185,7 @@ Section Uninstall
   
   Delete "$INSTDIR\*.*"
   Delete "$INSTDIR\doc\*.*"
-  Delete "$INSTDIR\fonts\*.*"
-  Delete "$INSTDIR\fonts\conf.d\*.*"
-  Delete "$INSTDIR\fonts\conf.avail\*.*"
   RMDir  "$INSTDIR\doc"
-  RMDIR  "$INSTDIR\fonts\conf.d"
-  RMDIR  "$INSTDIR\fonts\conf.avail"
-  RMDIR  "$INSTDIR\fonts"
   Delete "$SMPROGRAMS\HandBrake\Uninstall.lnk"
   Delete "$DESKTOP\HandBrake.lnk"
   Delete "$SMPROGRAMS\HandBrake\HandBrake.lnk"
diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi
index 07143f66b..62214e7d9 100644
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi
@@ -148,11 +148,6 @@ Section "HandBrake" SEC01
   SetOutPath "$INSTDIR\doc"
   SetOverwrite ifnewer
   File "doc\*.*"
-
-  ; Copy the standard fonts config set into the fonts folder
-  SetOutPath "$INSTDIR\fonts"
-  SetOverwrite ifnewer
-  File /r "fonts\*.*"
 SectionEnd
 
 Section -AdditionalIcons
@@ -189,13 +184,7 @@ Section Uninstall
   
   Delete "$INSTDIR\*.*"
   Delete "$INSTDIR\doc\*.*"
-  Delete "$INSTDIR\fonts\*.*"
-  Delete "$INSTDIR\fonts\conf.d\*.*"
-  Delete "$INSTDIR\fonts\conf.avail\*.*"
   RMDir  "$INSTDIR\doc"
-  RMDIR  "$INSTDIR\fonts\conf.d"
-  RMDIR  "$INSTDIR\fonts\conf.avail"
-  RMDIR  "$INSTDIR\fonts"
   Delete "$SMPROGRAMS\HandBrake Nightly\Uninstall.lnk"
   Delete "$DESKTOP\HandBrake Nightly.lnk"
   Delete "$SMPROGRAMS\HandBrake Nightly\HandBrake Nightly.lnk"
diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
index 12394598a..ff560121d 100644
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
@@ -147,11 +147,6 @@ Section "HandBrake" SEC01
   SetOutPath "$INSTDIR\doc"
   SetOverwrite ifnewer
   File "doc\*.*"
-
-  ; Copy the standard fonts config set into the fonts folder
-  SetOutPath "$INSTDIR\fonts"
-  SetOverwrite ifnewer
-  File /r "fonts\*.*"
 SectionEnd
 
 Section -AdditionalIcons
@@ -186,13 +181,7 @@ Section Uninstall
 
   Delete "$INSTDIR\*.*"
   Delete "$INSTDIR\doc\*.*"
-  Delete "$INSTDIR\fonts\*.*"
-  Delete "$INSTDIR\fonts\conf.d\*.*"
-  Delete "$INSTDIR\fonts\conf.avail\*.*"
   RMDir  "$INSTDIR\doc"
-  RMDIR  "$INSTDIR\fonts\conf.d"
-  RMDIR  "$INSTDIR\fonts\conf.avail"
-  RMDIR  "$INSTDIR\fonts"
   RMDir  "$INSTDIR"
    
   Delete "$SMPROGRAMS\HandBrake Nightly\Uninstall.lnk"