Bladeren bron

Upgraded with the new SNF upgrade .11 ( not .10 ) .11 came out mid .10 testing, so it got bumped.

Fix included Patch for MXGuard 4.2 install.  ( - Default Install Folder names changed. ) 
Fix included Patch for Merak Mail (Icewarp) 
- Default install did NOT auto create scan.dat file. Code depended on its presence in certain condition.  Installer corrected dependancy.  Auto creates or ignores as needed.

Testing upgraded for Imail v11
Testing upgraded for SmarterMail6?

git-svn-id: https://svn.microneil.com/svn/PKG-SNF-CS-WIN/trunk@20 ca630060-9ba5-4a53-a91e-8214b6452a9a
master
themeche 15 jaren geleden
bovenliggende
commit
c2a2a2837b
2 gewijzigde bestanden met toevoegingen van 16 en 8 verwijderingen
  1. 11
    4
      build/MessageSnifferInstaller2_1.nsi
  2. 5
    4
      build/MessageSnifferRestorer2_1.nsi

+ 11
- 4
build/MessageSnifferInstaller2_1.nsi Bestand weergeven

@@ -9,7 +9,7 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "Message Sniffer Server Installer"
## ADDINGPLATFORM ## STEP 0 :: INCREMENT BUILD NUMBER If Desired.
!define PRODUCT_VERSION "v3.2"
!define PRODUCT_VERSION "v3.3 - SNFv-E3.0.11"
!define PRODUCT_PUBLISHER "Arm Research"
SetCompressor lzma
@@ -718,7 +718,7 @@ Function installSNF4Alligate
WriteRegStr HKLM SOFTWARE\SolidOak\Alligate\Settings\Addins\MsgSniffer\ "ProcessDir" "$SNF4AlligateInstallFolder\Drop" ; This flags the directory.
WriteRegStr HKLM SOFTWARE\SolidOak\Alligate\Settings\Addins\MsgSniffer\ "ProcessDirLabel" "If you are using the Routing table feature to expressly define processing directories then you will need to manually set the folders you want Sniffer to scan, to process messages in the \Drop\ folder." ; This is "Sniffer"
; Now we determine what IMail was pointing at:
; Now we determine what Alligate was pointing at:
ReadRegStr $LocalKeyhandle HKLM "SOFTWARE\SolidOak\Alligate\Settings" "FilterEXE"
; if this returns with an error and an empty string, the tag didn't exist. LocalKeyhandle will be "";
@@ -993,13 +993,20 @@ Function DetermineMXGuard
Return
TestSmarterMail:
StrCmp $isSmarterMailInstalled "1" 0 ReportFalse
ifFileExists "C:\Program Files\dgSoft Internet Services\mxGuard for Mail Servers\mxGuard.xml" 0 ReportFalse
ifFileExists "C:\Program Files\dgSoft Internet Services\mxGuard for Mail Servers\mxGuard.xml" 0 Try4Pt2
; well we lucked out. Looks like its here.
${GetBetween} "<type>" "</type>" "C:\Program Files\dgSoft Internet Services\mxGuard for Mail Servers\mxGuard.xml" "$testVar"
StrCmp $testVar "SmarterMail" 0 ReportFalse
StrCpy $isMXGuardInstalled "1"
StrCpy $MXGuardInstallFolder "C:\Program Files\dgSoft Internet Services\mxGuard for Mail Servers"
Try4Pt2:
ifFileExists "C:\Program Files\dgSoft Internet Services\mxGuard for Mail Servers v4.2\mxGuard.xml" 0 ReportFalse
; well we lucked out. Looks like its here.
${GetBetween} "<type>" "</type>" "C:\Program Files\dgSoft Internet Services\mxGuard for Mail Servers v4.2\mxGuard.xml" "$testVar"
StrCmp $testVar "SmarterMail" 0 ReportFalse
StrCpy $isMXGuardInstalled "1"
StrCpy $MXGuardInstallFolder "C:\Program Files\dgSoft Internet Services\mxGuard for Mail Servers v4.2"
ReportFalse:
Return
FunctionEnd

+ 5
- 4
build/MessageSnifferRestorer2_1.nsi Bestand weergeven

@@ -1,6 +1,6 @@
!verbose 2
!define TEMP1 $R0 ;Temp variable
!define SNIFFER_SERVER_SPECIFIER "3.0" ; This is the ending of the product specific server file.... not the default Server.exe file.
!define SNIFFER_SERVER_SPECIFIER "V3.0.2-E3.0.11" ; This is the ending of the product specific server file.... not the default Server.exe file.
; MessageSnifferRestorer1_1_1.nsi
;
; This script produces an included installer file that is packed inside the MessageSniffer Installer utility.
@@ -4087,7 +4087,7 @@ Function stripScanXML
Return
UnableToFindContentFileXML:
MessageBox MB_OK "Unable to find IceWarps scan.dat file from: $IceWarpInstallFolder\config\scan.dat You will have to tie-in manually with IceWarp."
#MessageBox MB_OK "Unable to find IceWarps scan.dat file from: $IceWarpInstallFolder\config\scan.dat You will have to tie-in manually with IceWarp."
Return
FunctionEnd
@@ -4163,10 +4163,11 @@ Function editScanXML
FileOpen $IceWarpAdjustedFileHandle "$IceWarpInstallFolder\config\scanNEW.dat" w
clearerrors
IfFileExists "$IceWarpInstallFolder\config\scan.dat" 0 UnableToFindContentFileXML
IfFileExists "$IceWarpInstallFolder\config\scan.dat" 0 DoneReadingContentFile
#MessageBox MB_OK "Unable to find IceWarps scan.dat file from: $IceWarpInstallFolder\config\scan.dat Creating New File."
FileOpen $IceWarpContentFileHandle "$IceWarpInstallFolder\config\scan.dat" r
iferrors 0 ReadForProperyHeaderedFilterFile
MessageBox MB_OK "Unable to read IceWarps scan.dat file from: $IceWarpInstallFolder\config\scan.dat"
#MessageBox MB_OK "Unable to read IceWarps scan.dat file from: $IceWarpInstallFolder\config\scan.dat"
Goto DoneReadingContentFile
; You can have an empty file. With no headers... so first we either spin through without finding a valid header opener... and then

Laden…
Annuleren
Opslaan