boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

Windows Installer:

Browse Source 
- fix for firewall Vista/Win7
- update to JRE 1.6 u25
- TODO: fix for firewall WinXP and setting for uPnP (Port 1900)

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7689 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
pca 14 years ago
parent 4e8fa03514
commit 5e2d38ef19
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File

8
addon/download.php
Unescape View File

@ -17,12 +17,12 @@ $_GET['yacyrevnr'] not used yet
if ($_GET['what'] == 'jre') { if ($_GET['what'] == 'jre') {
if($_GET['version'] == 32) if($_GET['version'] == 32)
// jre-6u24-windows-i586.exe // jre-6u25-windows-i586.exe
header('Location: http://javadl.sun.com/webapps/download/AutoDL?BundleId=47364'); header('Location: http://javadl.sun.com/webapps/download/AutoDL?BundleId=48343');
if($_GET['version'] == 64) if($_GET['version'] == 64)
// jre-6u24-windows-x64.exe // jre-6u25-windows-x64.exe
header('Location: http://javadl.sun.com/webapps/download/AutoDL?BundleId=47155'); header('Location: http://javadl.sun.com/webapps/download/AutoDL?BundleId=48346');
} }

33
build.nsi
Unescape View File

@ -2,6 +2,7 @@
; ---------------------------------------- ; ----------------------------------------
;(C) 2004-2006 by Alexander Schier ;(C) 2004-2006 by Alexander Schier
;(C) 2008-2010 by David Wieditz ;(C) 2008-2010 by David Wieditz
;(C) 2011- by Rene Kluge
/*---------------------------------------- /*----------------------------------------
MANUALS MANUALS
http://nsis.sourceforge.net/Docs/ http://nsis.sourceforge.net/Docs/
@ -41,12 +42,12 @@ InstallDirRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\YaCy"
!define RecommendSpace "30" !define RecommendSpace "30"
; some string for Firewall ; some string for Firewall
!define WinXPAddFwRule 'netsh firewall add portopening protocol=tcp port=8090 name=YaCy mode=enable' !define WinXPAddFwRulePort 'netsh firewall add portopening protocol=tcp port=8090 name=YaCy mode=enable'
!define WinXPDelFwRule 'netsh firewall del portopening protocol=tcp port=8090' !define WinXPDelFwRulePort 'netsh firewall del portopening protocol=tcp port=8090'
!define WinVistaAddFwRule 'netsh advfirewall firewall add rule name="YaCy" dir=in action=allow protocol=tcp localport=8090' !define WinVistaAddFwRulePort 'netsh advfirewall firewall add rule name="YaCy" program="%SystemRoot%\System32\javaw.exe" dir=in action=allow protocol=tcp localport=8090'
!define WinVistaDelFwRule 'netsh advfirewall firewall del rule name="YaCy"' !define WinVistaDelFwRulePort 'netsh advfirewall firewall del rule name="YaCy"'
var WinAddFwRule var WinAddFwRulePort
var WinDelFwRule var WinDelFwRulePort
;requested execution level on Vista / 7 ;requested execution level on Vista / 7
@ -164,7 +165,7 @@ Section "YaCy"
WriteUninstaller "uninstall.exe" WriteUninstaller "uninstall.exe"
SectionEnd SectionEnd
Section "Sun Java" Sec_Java_id Section "Java (Oracle JRE)" Sec_Java_id
SectionIn 1 RO SectionIn 1 RO
SetShellVarContext current SetShellVarContext current
Call GetJRE Call GetJRE
@ -267,15 +268,15 @@ Function .onInit
${If} ${IsWinVista} ${If} ${IsWinVista}
${OrIf} ${IsWin7} ${OrIf} ${IsWin7}
StrCpy $WinAddFwRule '${WinVistaAddFwRule}' StrCpy $WinAddFwRulePort '${WinVistaAddFwRulePort}'
StrCpy $WinDelFwRule '${WinVistaDelFwRule}' StrCpy $WinDelFwRulePort '${WinVistaDelFwRulePort}'
ReadRegDWORD $FirewallServiceStart HKLM "SYSTEM\CurrentControlSet\services\MpsSvc" "Start" ReadRegDWORD $FirewallServiceStart HKLM "SYSTEM\CurrentControlSet\services\MpsSvc" "Start"
${EndIf} ${EndIf}
${If} ${IsWinXP} ${If} ${IsWinXP}
${AndIf} ${AtLeastServicePack} 2 ${AndIf} ${AtLeastServicePack} 2
StrCpy $WinAddFwRule '${WinXPAddFwRule}' StrCpy $WinAddFwRulePort '${WinXPAddFwRulePort}'
StrCpy $WinDelFwRule '${WinXPDelFwRule}' StrCpy $WinDelFwRulePort '${WinXPDelFwRulePort}'
ReadRegDWORD $FirewallServiceStart HKLM "SYSTEM\CurrentControlSet\services\SharedAccess" "Start" ReadRegDWORD $FirewallServiceStart HKLM "SYSTEM\CurrentControlSet\services\SharedAccess" "Start"
${EndIf} ${EndIf}
@ -386,11 +387,11 @@ FunctionEnd
Function OpenFirewall Function OpenFirewall
var /global ExecErrorCode var /global ExecErrorCode
; run netsh ; run netsh
nsExec::ExecToStack '$WinAddFwRule' nsExec::ExecToStack '$WinAddFwRulePort'
pop $ExecErrorCode pop $ExecErrorCode
; if run without error register for uninstall and clear finish page ; if run without error register for uninstall and clear finish page
${If} $ExecErrorCode = "0" ${If} $ExecErrorCode = "0"
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\YaCy" "DelFwRule" '$WinDelFwRule' WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\YaCy" "DelFwRulePort" '$WinDelFwRulePort'
IntOp $FirewallServiceStart 0 + 0 IntOp $FirewallServiceStart 0 + 0
${Else} ${Else}
IntOp $FirewallServiceStart 3 + 0 IntOp $FirewallServiceStart 3 + 0
@ -407,9 +408,9 @@ FunctionEnd
Function un.CloseFirewall Function un.CloseFirewall
; get string for closing port from registy ; get string for closing port from registy
ReadRegStr '$WinDelFwRule' HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\YaCy" "DelFwRule" ReadRegStr '$WinDelFwRulePort' HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\YaCy" "DelFwRulePort"
; if found > run netsh to close port ; if found > run netsh to close port
${IfNot} '$WinDelFwRule' == '' ${IfNot} '$WinDelFwRulePort' == ''
nsExec::ExecToStack '$WinDelFwRule' nsExec::ExecToStack '$WinDelFwRulePort'
${EndIf} ${EndIf}
FunctionEnd FunctionEnd

Write Preview
Loading…
Cancel
Save