correct many small bugs
This commit is contained in:
parent
6b3f7e23c0
commit
0b5f764d60
@ -1,3 +1,4 @@
|
||||
Files_init_copy
|
||||
|
||||
if ($LicenseRequired$ = "true")
|
||||
Dosbatch_config_agent_license_key
|
||||
@ -63,12 +64,16 @@ if ( $immunet_agent_cloud_upload_enable$ = "1")
|
||||
Dosbatch_agent_cloud_upload_enable
|
||||
endif
|
||||
|
||||
if ( $immunet_agent_cloud_upload_telemetry_enable$ = "1")
|
||||
Dosbatch_agent_cloud_upload_telemetry_enable
|
||||
if ( $immunet_agent_janus_upload_event_enable$ = "1")
|
||||
Dosbatch_agent_janus_upload_event_enable
|
||||
endif
|
||||
|
||||
if ( $immunet_agent_cloud_upload_metadata_enable$ = "1")
|
||||
Dosbatch_agent_cloud_upload_metadata_enable
|
||||
if ( $immunet_agent_metadata_enable$ = "1")
|
||||
Dosbatch_agent_metadata_enable
|
||||
endif
|
||||
|
||||
if ( $immunet_agent_monitor_enable$ = "1")
|
||||
Dosbatch_agent_monitor_enable
|
||||
endif
|
||||
|
||||
if ( $immunet_ui_notification_verbose$ = "1")
|
||||
@ -84,16 +89,20 @@ if ( $immunet_ui_notification_cloud$ = "1")
|
||||
endif
|
||||
|
||||
if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
|
||||
Dosbatch_final_copy_32
|
||||
endfi
|
||||
Files_final_copy_32
|
||||
endif
|
||||
|
||||
if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
|
||||
Dosbatch_final_copy_64
|
||||
endfi
|
||||
Files_final_copy_64
|
||||
endif
|
||||
|
||||
|
||||
[Files_init_copy]
|
||||
copy "%ScriptPath%\*.xml" "$LogDir$"
|
||||
|
||||
[Dosbatch_config_agent_license_key]
|
||||
copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
|
||||
|
||||
xml ed -O -u "/config/agent/license/key" -v $LicenseKey$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
|
||||
|
||||
[Dosbatch_agent_scansettings_clamav_devInit]
|
||||
@ -184,8 +193,8 @@ xml ed -O -u "/config/ui/notification/gaming" -v $immunet_ui_notification_gaming
|
||||
copy "$LogDir$\local.xml" "$LogDir$\local.xml.old"
|
||||
xml ed -O -u "/config/ui/notification/cloud" -v $immunet_ui_notification_cloud$ "$LogDir$\local.xml.old" > "$LogDir$\local.xml"
|
||||
|
||||
[Dosbatch_final_copy_32]
|
||||
copy "$LogDir$\local.xml" "$InstallDir32$\local.xml"
|
||||
[Files_final_copy_32]
|
||||
copy "$LogDir$\local.xml" "$InstallDir32$"
|
||||
|
||||
[Dosbatch_final_copy_64]
|
||||
copy "$LogDir$\local.xml" "$InstallDir64$\local.xml"
|
||||
[Files_final_copy_64]
|
||||
copy "$LogDir$\local.xml" "$InstallDir64$"
|
||||
|
@ -1,43 +1,45 @@
|
||||
DefVar $immunet_agent_scansettings_clamav_devInit$
|
||||
Set $immunet_agent_scansettings_clamav_devInit$ = GetProductProperty("agent_scansettings_clamav_devInit", "1")
|
||||
DefVar $immunet_agent_scansettings_clamav_enable$
|
||||
Set $immunet_agent_scansettings_clamav_enable$ = GetProductProperty("agent_scansettings_clamav_enable", "1")
|
||||
DefVar $immunet_agent_scansettings_clamav_updater_enable$
|
||||
Set $immunet_agent_scansettings_clamav_updater_enable$ = GetProductProperty("agent_scansettings_clamav_updater_enable", "1")
|
||||
DefVar $immunet_agent_scansettings_clamav_options_ondemand_scanarchives$
|
||||
Set $immunet_agent_scansettings_clamav_options_ondemand_scanarchives$ = GetProductProperty("agent_scansettings_clamav_options_ondemand_scanarchives", "1")
|
||||
DefVar $immunet_agent_scansettings_clamav_options_ondemand_scanpacked$
|
||||
Set $immunet_agent_scansettings_clamav_options_ondemand_scanpacked$ = GetProductProperty("agent_scansettings_clamav_options_ondemand_scanpacked", "1")
|
||||
DefVar $immunet_agent_scansettings_tetra_options_ondemand_scanarchives$
|
||||
Set $immunet_agent_scansettings_tetra_options_ondemand_scanarchives$ = GetProductProperty("agent_scansettings_tetra_options_ondemand_scanarchives", "1")
|
||||
DefVar $immunet_agent_scansettings_tetra_options_ondemand_scanpacked$
|
||||
Set $immunet_agent_scansettings_tetra_options_ondemand_scanpacked$ = GetProductProperty("agent_scansettings_tetra_options_ondemand_scanpacked", "1")
|
||||
DefVar $immunet_agent_scansettings_ethos_enable$
|
||||
Set $immunet_agent_scansettings_ethos_enable$ = GetProductProperty("agent_scansettings_ethos_enable", "1")
|
||||
DefVar $immunet_agent_scansettings_spero_enable$
|
||||
Set $immunet_agent_scansettings_spero_enable$ = GetProductProperty("agent_scansettings_spero_enable", "1")
|
||||
DefVar $immunet_agent_scansettings_action_malware$
|
||||
Set $immunet_agent_scansettings_action_malware$ = GetProductProperty("agent_scansettings_action_malware", "1")
|
||||
DefVar $immunet_agent_scansettings_action_suspicious$
|
||||
Set $immunet_agent_scansettings_action_suspicious$ = GetProductProperty("agent_scansettings_action_suspicious", "1")
|
||||
DefVar $immunet_agent_driver_protmode_active$
|
||||
Set $immunet_agent_driver_protmode_active$ = GetProductProperty("agent_driver_protmode_active", "1")
|
||||
DefVar $immunet_agent_driver_protmode_file$
|
||||
Set $immunet_agent_driver_protmode_file$ = GetProductProperty("agent_driver_protmode_file", "1")
|
||||
DefVar $immunet_agent_driver_protmode_process$
|
||||
Set $immunet_agent_driver_protmode_process$ = GetProductProperty("agent_driver_protmode_process", "1")
|
||||
DefVar $immunet_agent_cloud_upload_enable$
|
||||
Set $immunet_agent_cloud_upload_enable$ = GetProductProperty("agent_cloud_upload_enable", "1")
|
||||
DefVar $immunet_agent_janus_upload_event_enable$
|
||||
Set $immunet_agent_janus_upload_event_enable$ = GetProductProperty("agent_janus_upload_event_enable", "1")
|
||||
DefVar $immunet_agent_metadata_enable$
|
||||
Set $immunet_agent_metadata_enable$ = GetProductProperty("agent_metadata_enable", "1")
|
||||
DefVar $immunet_agent_monitor_enable$
|
||||
Set $immunet_agent_monitor_enable$ = GetProductProperty("agent_metadata_enable", "1")
|
||||
DefVar $immunet_ui_notification_verbose$
|
||||
Set $immunet_ui_notification_verbose$ = GetProductProperty("ui_notification_verbose", "1")
|
||||
DefVar $immunet_ui_notification_gaming$
|
||||
Set $immunet_ui_notification_gaming$ = GetProductProperty("ui_notification_gaming", "1")
|
||||
DefVar $immunet_ui_notification_cloud$
|
||||
Set $immunet_ui_notification_cloud$ = GetProductProperty("ui_notification_cloud", "1")
|
||||
Set $LicenseRequired$ = GetProductProperty("immunet_license_required", "true")
|
||||
|
||||
DefVar $immunet_agent_scansettings_clamav_devInit$
|
||||
Set $immunet_agent_scansettings_clamav_devInit$ = GetProductProperty("immunet_agent_scansettings_clamav_devInit", "1")
|
||||
DefVar $immunet_agent_scansettings_clamav_enable$
|
||||
Set $immunet_agent_scansettings_clamav_enable$ = GetProductProperty("immunet_agent_scansettings_clamav_enable", "1")
|
||||
DefVar $immunet_agent_scansettings_clamav_updater_enable$
|
||||
Set $immunet_agent_scansettings_clamav_updater_enable$ = GetProductProperty("immunet_agent_scansettings_clamav_updater_enable", "1")
|
||||
DefVar $immunet_agent_scansettings_clamav_options_ondemand_scanarchives$
|
||||
Set $immunet_agent_scansettings_clamav_options_ondemand_scanarchives$ = GetProductProperty("immunet_agent_scansettings_clamav_options_ondemand_scanarchives", "1")
|
||||
DefVar $immunet_agent_scansettings_clamav_options_ondemand_scanpacked$
|
||||
Set $immunet_agent_scansettings_clamav_options_ondemand_scanpacked$ = GetProductProperty("immunet_agent_scansettings_clamav_options_ondemand_scanpacked", "1")
|
||||
DefVar $immunet_agent_scansettings_tetra_options_ondemand_scanarchives$
|
||||
Set $immunet_agent_scansettings_tetra_options_ondemand_scanarchives$ = GetProductProperty("immunet_agent_scansettings_tetra_options_ondemand_scanarchives", "1")
|
||||
DefVar $immunet_agent_scansettings_tetra_options_ondemand_scanpacked$
|
||||
Set $immunet_agent_scansettings_tetra_options_ondemand_scanpacked$ = GetProductProperty("immunet_agent_scansettings_tetra_options_ondemand_scanpacked", "1")
|
||||
DefVar $immunet_agent_scansettings_ethos_enable$
|
||||
Set $immunet_agent_scansettings_ethos_enable$ = GetProductProperty("immunet_agent_scansettings_ethos_enable", "1")
|
||||
DefVar $immunet_agent_scansettings_spero_enable$
|
||||
Set $immunet_agent_scansettings_spero_enable$ = GetProductProperty("immunet_agent_scansettings_spero_enable", "1")
|
||||
DefVar $immunet_agent_scansettings_action_malware$
|
||||
Set $immunet_agent_scansettings_action_malware$ = GetProductProperty("immunet_agent_scansettings_action_malware", "1")
|
||||
DefVar $immunet_agent_scansettings_action_suspicious$
|
||||
Set $immunet_agent_scansettings_action_suspicious$ = GetProductProperty("immunet_agent_scansettings_action_suspicious", "1")
|
||||
DefVar $immunet_agent_driver_protmode_active$
|
||||
Set $immunet_agent_driver_protmode_active$ = GetProductProperty("immunet_agent_driver_protmode_active", "1")
|
||||
DefVar $immunet_agent_driver_protmode_file$
|
||||
Set $immunet_agent_driver_protmode_file$ = GetProductProperty("immunet_agent_driver_protmode_file", "1")
|
||||
DefVar $immunet_agent_driver_protmode_process$
|
||||
Set $immunet_agent_driver_protmode_process$ = GetProductProperty("immunet_agent_driver_protmode_process", "1")
|
||||
DefVar $immunet_agent_cloud_upload_enable$
|
||||
Set $immunet_agent_cloud_upload_enable$ = GetProductProperty("immunet_agent_cloud_upload_enable", "1")
|
||||
DefVar $immunet_agent_janus_upload_event_enable$
|
||||
Set $immunet_agent_janus_upload_event_enable$ = GetProductProperty("immunet_agent_janus_upload_event_enable", "1")
|
||||
DefVar $immunet_agent_metadata_enable$
|
||||
Set $immunet_agent_metadata_enable$ = GetProductProperty("immunet_agent_metadata_enable", "1")
|
||||
DefVar $immunet_agent_monitor_enable$
|
||||
Set $immunet_agent_monitor_enable$ = GetProductProperty("immunet_agent_monitor_enable", "1")
|
||||
DefVar $immunet_ui_notification_verbose$
|
||||
Set $immunet_ui_notification_verbose$ = GetProductProperty("immunet_ui_notification_verbose", "1")
|
||||
DefVar $immunet_ui_notification_gaming$
|
||||
Set $immunet_ui_notification_gaming$ = GetProductProperty("immunet_ui_notification_gaming", "1")
|
||||
DefVar $immunet_ui_notification_cloud$
|
||||
Set $immunet_ui_notification_cloud$ = GetProductProperty("immunet_ui_notification_cloud", "1")
|
||||
|
||||
|
@ -108,12 +108,6 @@ delete -sf "$InstallDir32$\"
|
||||
[Winbatch_uninstall_64]
|
||||
"$UninstallProgram64$" /S
|
||||
|
||||
[Winbatch_uninstall_msi_old_64]
|
||||
msiexec /x $MsiIdOld64$ /qb! REBOOT=ReallySuppress
|
||||
|
||||
[Winbatch_uninstall_msi_64]
|
||||
msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress
|
||||
|
||||
[Files_uninstall_64]
|
||||
; Example for recursively deleting the installation directory:
|
||||
;
|
||||
|
@ -57,7 +57,7 @@ Set $MinimumSpace$ = "100 MB"
|
||||
; the path were we find the product after the installation
|
||||
Set $InstallDir32$ = "%ProgramFiles32Dir%\Immunet"
|
||||
Set $InstallDir64$ = "%ProgramFiles64Dir%\Immunet"
|
||||
Set $LicenseRequired$ = "true"
|
||||
; Set $LicenseRequired$ = "true"
|
||||
Set $LicensePool$ = "p_" + $ProductId$
|
||||
; ----------------------------------------------------------------
|
||||
|
||||
@ -76,16 +76,16 @@ else
|
||||
Sub "%ScriptPath%\delsub3264.ins"
|
||||
endif
|
||||
|
||||
if FileExists("%ScriptPath%\config3264.ins")
|
||||
comment "Start Config sub section"
|
||||
Sub "%ScriptPath%\config3264.ins"
|
||||
endif
|
||||
|
||||
if $LicenseRequired$ = "true"
|
||||
comment "Licensing required, reserve license and get license key"
|
||||
Sub_get_licensekey
|
||||
endif
|
||||
|
||||
if FileExists("%ScriptPath%\config3264.ins")
|
||||
comment "Start Config sub section"
|
||||
Sub "%ScriptPath%\config3264.ins"
|
||||
endif
|
||||
|
||||
comment "installing"
|
||||
|
||||
if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
|
||||
@ -143,7 +143,6 @@ reg.exe Delete "HKCU\Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags
|
||||
[Files_install_32]
|
||||
; copy the ini file to the InstallDir
|
||||
copy "$IniCfgFile$" "$InstallDir32$"
|
||||
copy "%ScriptPath%\*.xml" "$LogDir$"
|
||||
|
||||
; Example of recursively copying some files into the installation directory:
|
||||
;
|
||||
@ -157,7 +156,6 @@ reg.exe Delete "HKCU\Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags
|
||||
[Files_install_64]
|
||||
; copy the ini file to the InstallDir
|
||||
copy "$IniCfgFile$" "$InstallDir64$"
|
||||
copy "%ScriptPath%\*.xml" "$LogDir$"
|
||||
|
||||
; Example of recursively copying some files into the installation directory:
|
||||
;
|
||||
|
@ -50,7 +50,7 @@ include_insert "define3264.inc"
|
||||
; ----------------------------------------------------------------
|
||||
Set $InstallDir32$ = "%ProgramFiles32Dir%\Immunet"
|
||||
Set $InstallDir64$ = "%ProgramFiles64Dir%\Immunet"
|
||||
Set $LicenseRequired$ = "true"
|
||||
; Set $LicenseRequired$ = "true"
|
||||
Set $LicensePool$ = "p_" + $ProductId$
|
||||
; ----------------------------------------------------------------
|
||||
|
||||
|
51
OPSI/control
51
OPSI/control
@ -44,7 +44,16 @@ requirementType: before
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: agent_scansettings_clamav_devInit
|
||||
name: immunet_license_required
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Activate ClamAV Devs
|
||||
values: ["false", "true"]
|
||||
default: ["true"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: immunet_agent_scansettings_clamav_devInit
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Activate ClamAV Devs
|
||||
@ -53,7 +62,7 @@ default: ["1"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: agent_scansettings_clamav_enable
|
||||
name: immunet_agent_scansettings_clamav_enable
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Activate ClamAV
|
||||
@ -62,7 +71,7 @@ default: ["1"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: agent_scansettings_clamav_updater_enable
|
||||
name: immunet_agent_scansettings_clamav_updater_enable
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Enable autoupdate of ClamAV
|
||||
@ -71,7 +80,7 @@ default: ["1"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: agent_scansettings_clamav_options_ondemand_scanarchives
|
||||
name: immunet_agent_scansettings_clamav_options_ondemand_scanarchives
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Clamav Scan Archives
|
||||
@ -80,7 +89,7 @@ default: ["1"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: agent_scansettings_clamav_options_ondemand_scanpacked
|
||||
name: immunet_agent_scansettings_clamav_options_ondemand_scanpacked
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: ClamAV Scan Packed
|
||||
@ -89,7 +98,7 @@ default: ["1"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: agent_scansettings_tetra_options_ondemand_scanarchives
|
||||
name: immunet_agent_scansettings_tetra_options_ondemand_scanarchives
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Tetra Scan Archives
|
||||
@ -98,7 +107,7 @@ default: ["1"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: agent_scansettings_tetra_options_ondemand_scanpacked
|
||||
name: immunet_agent_scansettings_tetra_options_ondemand_scanpacked
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Tetra Scan Packed
|
||||
@ -107,7 +116,7 @@ default: ["1"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: agent_scansettings_ethos_enable
|
||||
name: immunet_agent_scansettings_ethos_enable
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Activate Ethos Scan
|
||||
@ -116,7 +125,7 @@ default: ["1"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: agent_scansettings_spero_enable
|
||||
name: immunet_agent_scansettings_spero_enable
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Activate Spero Scan
|
||||
@ -125,7 +134,7 @@ default: ["1"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: agent_scansettings_action_malware
|
||||
name: immunet_agent_scansettings_action_malware
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Enable Scan for Malware
|
||||
@ -134,7 +143,7 @@ default: ["1"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: agent_scansettings_action_suspicious
|
||||
name: immunet_agent_scansettings_action_suspicious
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Enable Scan for Suspicious
|
||||
@ -143,7 +152,7 @@ default: ["1"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: agent_driver_protmode_active
|
||||
name: immunet_agent_driver_protmode_active
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Activate Protection
|
||||
@ -152,7 +161,7 @@ default: ["1"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: agent_driver_protmode_file
|
||||
name: immunet_agent_driver_protmode_file
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Activate File Protect
|
||||
@ -161,7 +170,7 @@ default: ["1"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: agent_driver_protmode_process
|
||||
name: immunet_agent_driver_protmode_process
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Activate Process Protect
|
||||
@ -170,7 +179,7 @@ default: ["1"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: agent_cloud_upload_enable
|
||||
name: immunet_agent_cloud_upload_enable
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Enable Upload to Cloud
|
||||
@ -179,7 +188,7 @@ default: ["1"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: agent_janus_upload_event_enable
|
||||
name: immunet_agent_janus_upload_event_enable
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Enable Upload to Cloud telemetry data
|
||||
@ -188,7 +197,7 @@ default: ["1"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: agent_metadata_enable
|
||||
name: immunet_agent_metadata_enable
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Enable Upload to Cloud file metadata
|
||||
@ -197,7 +206,7 @@ default: ["1"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: agent_monitor_enable
|
||||
name: immunet_agent_monitor_enable
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Enable Monitor network traffic to detect connections to potentially malicious hosts
|
||||
@ -206,7 +215,7 @@ default: ["1"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: ui_notification_verbose
|
||||
name: immunet_ui_notification_verbose
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Enable Verbose Notification
|
||||
@ -215,7 +224,7 @@ default: ["0"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: ui_notification_gaming
|
||||
name: immunet_ui_notification_gaming
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Enable Gaming Notification
|
||||
@ -224,7 +233,7 @@ default: ["0"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: ui_notification_cloud
|
||||
name: immunet_ui_notification_cloud
|
||||
multivalue: False
|
||||
editable: False
|
||||
description: Enable Cloud Notification
|
||||
|
Loading…
Reference in New Issue
Block a user