From: Norbert Bizet <norbert.bizet@baculasystems.com>
Date: Fri, 2 Oct 2020 09:48:37 +0000 (-0400)
Subject: win32: In silent mode, enable fd and plugins by default
X-Git-Tag: Release-11.3.2~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea4ef902b7e5f017c3d2308e23437d75f0336315;p=thirdparty%2Fbacula.git

win32: In silent mode, enable fd and plugins by default
---

diff --git a/bacula/src/win32/full_win32_installer/winbacula.nsi b/bacula/src/win32/full_win32_installer/winbacula.nsi
index acb463a84..ed2249aeb 100644
--- a/bacula/src/win32/full_win32_installer/winbacula.nsi
+++ b/bacula/src/win32/full_win32_installer/winbacula.nsi
@@ -1306,15 +1306,15 @@ FunctionEnd
 
 ; in silent mode, we manually select or deselect modules, depending on cmdline parameter
 Function SilentSelectComponents
-  ClearErrors
-  ${GetOptions} $CMDLINE "-ComponentFile" $TmpComponent
-  ${IfNot} ${Errors}
-    !InsertMacro SelectSection ${SecFileDaemon}
-    !InsertMacro SetSectionFlag ${SecFileDaemon} ${SF_RO}
-  ${Else}
-    !InsertMacro UnselectSection ${SecFileDaemon}
-    !InsertMacro ClearSectionFlag ${SecFileDaemon} ${SF_RO}
-  ${EndIf}
+  ; by default fd and plugins are selected
+  !InsertMacro SelectSection ${SecFileDaemon}
+  !InsertMacro SetSectionFlag ${SecFileDaemon} ${SF_RO}
+  !InsertMacro SelectSection ${SecAllDrivesPlugin}
+  !InsertMacro SetSectionFlag ${SecAllDrivesPlugin} ${SF_RO}
+  !InsertMacro SelectSection ${SecWinBMRPlugin}
+  !InsertMacro SetSectionFlag ${SecWinBMRPlugin} ${SF_RO}
+  !InsertMacro SelectSection ${SecCDPPlugin}
+  !InsertMacro SetSectionFlag ${SecCDPPlugin} ${SF_RO}
   ClearErrors
   ${GetOptions} $CMDLINE "-ComponentStorage" $TmpComponent
   ${IfNot} ${Errors}
@@ -1352,33 +1352,6 @@ Function SilentSelectComponents
     !InsertMacro ClearSectionFlag ${SecTrayMonitor} ${SF_RO}
   ${EndIf}
   ClearErrors
-  ${GetOptions} $CMDLINE "-ComponentAllDrivesPlugin" $TmpComponent
-  ${IfNot} ${Errors}
-    !InsertMacro SelectSection ${SecAllDrivesPlugin}
-    !InsertMacro SetSectionFlag ${SecAllDrivesPlugin} ${SF_RO}
-  ${Else}
-    !InsertMacro UnselectSection ${SecAllDrivesPlugin}
-    !InsertMacro ClearSectionFlag ${SecAllDrivesPlugin} ${SF_RO}
-  ${EndIf}
-  ClearErrors
-  ${GetOptions} $CMDLINE "-ComponentWinBMRPlugin" $TmpComponent
-  ${IfNot} ${Errors}
-    !InsertMacro SelectSection ${SecWinBMRPlugin}
-    !InsertMacro SetSectionFlag ${SecWinBMRPlugin} ${SF_RO}
-  ${Else}
-    !InsertMacro UnselectSection ${SecWinBMRPlugin}
-    !InsertMacro ClearSectionFlag ${SecWinBMRPlugin} ${SF_RO}
-  ${EndIf}
-  ClearErrors
-  ${GetOptions} $CMDLINE "-ComponentCDPPlugin" $TmpComponent
-  ${IfNot} ${Errors}
-    !InsertMacro SelectSection ${SecCDPPlugin}
-    !InsertMacro SetSectionFlag ${SecCDPPlugin} ${SF_RO}
-  ${Else}
-    !InsertMacro UnselectSection ${SecCDPPlugin}
-    !InsertMacro ClearSectionFlag ${SecCDPPlugin} ${SF_RO}
-  ${EndIf}
-  ClearErrors
 FunctionEnd
 
 Function SelectPreviousComponents
diff --git a/bacula/src/win32/win32_installer/winbacula.nsi b/bacula/src/win32/win32_installer/winbacula.nsi
index fe2c5b91b..32cb41d52 100644
--- a/bacula/src/win32/win32_installer/winbacula.nsi
+++ b/bacula/src/win32/win32_installer/winbacula.nsi
@@ -1169,15 +1169,15 @@ FunctionEnd
 
 ; in silent mode, we manually select or deselect modules, depending on cmdline parameter
 Function SilentSelectComponents
-  ClearErrors
-  ${GetOptions} $CMDLINE "-ComponentFile" $TmpComponent
-  ${IfNot} ${Errors}
-    !InsertMacro SelectSection ${SecFileDaemon}
-    !InsertMacro SetSectionFlag ${SecFileDaemon} ${SF_RO}
-  ${Else}
-    !InsertMacro UnselectSection ${SecFileDaemon}
-    !InsertMacro ClearSectionFlag ${SecFileDaemon} ${SF_RO}
-  ${EndIf}
+  ; by default fd and plugins are selected
+  !InsertMacro SelectSection ${SecFileDaemon}
+  !InsertMacro SetSectionFlag ${SecFileDaemon} ${SF_RO}
+  !InsertMacro SelectSection ${SecAllDrivesPlugin}
+  !InsertMacro SetSectionFlag ${SecAllDrivesPlugin} ${SF_RO}
+  !InsertMacro SelectSection ${SecWinBMRPlugin}
+  !InsertMacro SetSectionFlag ${SecWinBMRPlugin} ${SF_RO}
+  !InsertMacro SelectSection ${SecCDPPlugin}
+  !InsertMacro SetSectionFlag ${SecCDPPlugin} ${SF_RO}
   ClearErrors
   ${GetOptions} $CMDLINE "-ComponentStorage" $TmpComponent
   ${IfNot} ${Errors}
@@ -1215,33 +1215,6 @@ Function SilentSelectComponents
     !InsertMacro ClearSectionFlag ${SecTrayMonitor} ${SF_RO}
   ${EndIf}
   ClearErrors
-  ${GetOptions} $CMDLINE "-ComponentAllDrivesPlugin" $TmpComponent
-  ${IfNot} ${Errors}
-    !InsertMacro SelectSection ${SecAllDrivesPlugin}
-    !InsertMacro SetSectionFlag ${SecAllDrivesPlugin} ${SF_RO}
-  ${Else}
-    !InsertMacro UnselectSection ${SecAllDrivesPlugin}
-    !InsertMacro ClearSectionFlag ${SecAllDrivesPlugin} ${SF_RO}
-  ${EndIf}
-  ClearErrors
-  ${GetOptions} $CMDLINE "-ComponentWinBMRPlugin" $TmpComponent
-  ${IfNot} ${Errors}
-    !InsertMacro SelectSection ${SecWinBMRPlugin}
-    !InsertMacro SetSectionFlag ${SecWinBMRPlugin} ${SF_RO}
-  ${Else}
-    !InsertMacro UnselectSection ${SecWinBMRPlugin}
-    !InsertMacro ClearSectionFlag ${SecWinBMRPlugin} ${SF_RO}
-  ${EndIf}
-  ClearErrors
-  ${GetOptions} $CMDLINE "-ComponentCDPPlugin" $TmpComponent
-  ${IfNot} ${Errors}
-    !InsertMacro SelectSection ${SecCDPPlugin}
-    !InsertMacro SetSectionFlag ${SecCDPPlugin} ${SF_RO}
-  ${Else}
-    !InsertMacro UnselectSection ${SecCDPPlugin}
-    !InsertMacro ClearSectionFlag ${SecCDPPlugin} ${SF_RO}
-  ${EndIf}
-  ClearErrors
 FunctionEnd
 
 Function SelectPreviousComponents
diff --git a/bacula/src/win32/win64_installer/winbacula.nsi b/bacula/src/win32/win64_installer/winbacula.nsi
index 6d2d711d2..d5e2d120c 100644
--- a/bacula/src/win32/win64_installer/winbacula.nsi
+++ b/bacula/src/win32/win64_installer/winbacula.nsi
@@ -1108,15 +1108,15 @@ FunctionEnd
 
 ; in silent mode, we manually select or deselect modules, depending on cmdline parameter
 Function SilentSelectComponents
-  ClearErrors
-  ${GetOptions} $CMDLINE "-ComponentFile" $TmpComponent
-  ${IfNot} ${Errors}
-    !InsertMacro SelectSection ${SecFileDaemon}
-    !InsertMacro SetSectionFlag ${SecFileDaemon} ${SF_RO}
-  ${Else}
-    !InsertMacro UnselectSection ${SecFileDaemon}
-    !InsertMacro ClearSectionFlag ${SecFileDaemon} ${SF_RO}
-  ${EndIf}
+  ; by default fd and plugins are selected
+  !InsertMacro SelectSection ${SecFileDaemon}
+  !InsertMacro SetSectionFlag ${SecFileDaemon} ${SF_RO}
+  !InsertMacro SelectSection ${SecAllDrivesPlugin}
+  !InsertMacro SetSectionFlag ${SecAllDrivesPlugin} ${SF_RO}
+  !InsertMacro SelectSection ${SecWinBMRPlugin}
+  !InsertMacro SetSectionFlag ${SecWinBMRPlugin} ${SF_RO}
+  !InsertMacro SelectSection ${SecCDPPlugin}
+  !InsertMacro SetSectionFlag ${SecCDPPlugin} ${SF_RO}
   ClearErrors
   ${GetOptions} $CMDLINE "-ComponentStorage" $TmpComponent
   ${IfNot} ${Errors}
@@ -1154,33 +1154,6 @@ Function SilentSelectComponents
     !InsertMacro ClearSectionFlag ${SecTrayMonitor} ${SF_RO}
   ${EndIf}
   ClearErrors
-  ${GetOptions} $CMDLINE "-ComponentAllDrivesPlugin" $TmpComponent
-  ${IfNot} ${Errors}
-    !InsertMacro SelectSection ${SecAllDrivesPlugin}
-    !InsertMacro SetSectionFlag ${SecAllDrivesPlugin} ${SF_RO}
-  ${Else}
-    !InsertMacro UnselectSection ${SecAllDrivesPlugin}
-    !InsertMacro ClearSectionFlag ${SecAllDrivesPlugin} ${SF_RO}
-  ${EndIf}
-  ClearErrors
-  ${GetOptions} $CMDLINE "-ComponentWinBMRPlugin" $TmpComponent
-  ${IfNot} ${Errors}
-    !InsertMacro SelectSection ${SecWinBMRPlugin}
-    !InsertMacro SetSectionFlag ${SecWinBMRPlugin} ${SF_RO}
-  ${Else}
-    !InsertMacro UnselectSection ${SecWinBMRPlugin}
-    !InsertMacro ClearSectionFlag ${SecWinBMRPlugin} ${SF_RO}
-  ${EndIf}
-  ClearErrors
-  ${GetOptions} $CMDLINE "-ComponentCDPPlugin" $TmpComponent
-  ${IfNot} ${Errors}
-    !InsertMacro SelectSection ${SecCDPPlugin}
-    !InsertMacro SetSectionFlag ${SecCDPPlugin} ${SF_RO}
-  ${Else}
-    !InsertMacro UnselectSection ${SecCDPPlugin}
-    !InsertMacro ClearSectionFlag ${SecCDPPlugin} ${SF_RO}
-  ${EndIf}
-  ClearErrors
 FunctionEnd
 
 Function SelectPreviousComponents