mirror of
https://github.com/yacy/yacy_search_server.git
synced 2024-09-19 00:01:41 +02:00
rename of Windows start scripts
* startYACY.bat -> startYACY_debug.bat * startYACY_noconsole.bat -> startYACY.bat changes for Windows Installer * do not set shortcuts to the YaCy search page because we have a tray icon now. the user will not get an error if yacy doesn't run. * do not set a shortcut do debug start. usual users don't care about logs. git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4993 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
lotus
parent
f8a1e3175e
commit
0bb7c42bc8
|
|
@ -1,7 +1,9 @@
|
|||
@Echo Off
|
||||
title YaCy
|
||||
|
||||
if exist DATA\yacy.noconsole del DATA\yacy.noconsole
|
||||
REM setting startup type for proper restart
|
||||
if not exist DATA md DATA
|
||||
echo . >DATA\yacy.noconsole
|
||||
|
||||
If %1.==CPGEN. GoTo :CPGEN
|
||||
|
||||
|
|
@ -16,7 +18,6 @@ set jms=
|
|||
set javacmd=-Xmx120m -Xms120m
|
||||
set priolvl=0
|
||||
set priority=/NORMAL
|
||||
set port=8080
|
||||
if exist DATA\SETTINGS\httpProxy.conf GoTo :RENAMEINDEX
|
||||
if exist DATA\SETTINGS\yacy.conf GoTo :GETSTARTOPTS
|
||||
|
||||
|
|
@ -24,24 +25,11 @@ if exist DATA\SETTINGS\yacy.conf GoTo :GETSTARTOPTS
|
|||
Rem Starting YaCy
|
||||
Echo Generated classpath:%CLASSPATH%
|
||||
Echo JRE Parameters:%javacmd%
|
||||
Echo Priority:%priority%
|
||||
Echo Priority:%priority%
|
||||
start %priority% javaw %javacmd% -classpath %CLASSPATH% yacy
|
||||
Echo You can close the console safely now.
|
||||
|
||||
Echo ****************** YaCy Web Crawler/Indexer ^& Search Engine ******************
|
||||
Echo **** (C) by Michael Peter Christen, usage granted under the GPL Version 2 ****
|
||||
Echo **** USE AT YOUR OWN RISK! Project home and releases: http://yacy.net/ ****
|
||||
Echo ** LOG of YaCy: DATA/LOG/yacy00.log (and yacy^<xx^>.log) **
|
||||
Echo ** STOP YaCy: execute stopYACY.bat and wait some seconds **
|
||||
Echo ** GET HELP for YaCy: see www.yacy-websearch.net/wiki and forum.yacy.de **
|
||||
Echo *******************************************************************************
|
||||
Echo ^>^> YaCy started as daemon process. Administration at http://localhost:%port% ^<^<
|
||||
|
||||
title YaCy - http://localhost:%port%
|
||||
|
||||
start "YaCy" %priority% /B /WAIT java %javacmd% -classpath %CLASSPATH% yacy
|
||||
|
||||
if not exist DATA\yacy.restart GoTo :END
|
||||
del DATA\yacy.restart
|
||||
GoTo :GETSTARTOPTS
|
||||
GoTo :END
|
||||
|
||||
Rem PUBLIC is now freeworld (r4575)
|
||||
:RENAMEINDEX
|
||||
|
|
@ -57,16 +45,15 @@ cd ..
|
|||
Rem This target is used to read java runtime parameters out of the yacy config file
|
||||
:GETSTARTOPTS
|
||||
for /F "tokens=1,2 delims==" %%i in (DATA\SETTINGS\yacy.conf) do (
|
||||
if "%%i"=="javastart_Xmx" set jmx=%%j
|
||||
if "%%i"=="javastart_Xms" set jms=%%j
|
||||
if "%%i"=="port" set port=%%j
|
||||
if "%%i"=="javastart_priority" set priolvl=%%j
|
||||
if "%%i"=="javastart_Xmx" set jmx=%%j
|
||||
if "%%i"=="javastart_Xms" set jms=%%j
|
||||
if "%%i"=="javastart_priority" set priolvl=%%j
|
||||
)
|
||||
if defined jmx set javacmd=-%jmx%
|
||||
if defined jms set javacmd=-%jms% %javacmd%
|
||||
if defined priolvl (
|
||||
if %priolvl% == 20 set priority=/LOW
|
||||
if %priolvl% == 10 set priority=/BELOWNORMAL
|
||||
if %priolvl% == 20 set priority=/LOW
|
||||
if %priolvl% == 10 set priority=/BELOWNORMAL
|
||||
)
|
||||
|
||||
GoTo :STARTJAVA
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
@Echo Off
|
||||
title YaCy
|
||||
|
||||
REM setting startup type for proper restart
|
||||
if not exist DATA md DATA
|
||||
echo . >DATA\yacy.noconsole
|
||||
if exist DATA\yacy.noconsole del DATA\yacy.noconsole
|
||||
|
||||
If %1.==CPGEN. GoTo :CPGEN
|
||||
|
||||
|
|
@ -18,6 +16,7 @@ set jms=
|
|||
set javacmd=-Xmx120m -Xms120m
|
||||
set priolvl=0
|
||||
set priority=/NORMAL
|
||||
set port=8080
|
||||
if exist DATA\SETTINGS\httpProxy.conf GoTo :RENAMEINDEX
|
||||
if exist DATA\SETTINGS\yacy.conf GoTo :GETSTARTOPTS
|
||||
|
||||
|
|
@ -25,11 +24,24 @@ if exist DATA\SETTINGS\yacy.conf GoTo :GETSTARTOPTS
|
|||
Rem Starting YaCy
|
||||
Echo Generated classpath:%CLASSPATH%
|
||||
Echo JRE Parameters:%javacmd%
|
||||
Echo Priority:%priority%
|
||||
start %priority% javaw %javacmd% -classpath %CLASSPATH% yacy
|
||||
Echo You can close the console safely now.
|
||||
Echo Priority:%priority%
|
||||
|
||||
GoTo :END
|
||||
Echo ****************** YaCy Web Crawler/Indexer ^& Search Engine ******************
|
||||
Echo **** (C) by Michael Peter Christen, usage granted under the GPL Version 2 ****
|
||||
Echo **** USE AT YOUR OWN RISK! Project home and releases: http://yacy.net/ ****
|
||||
Echo ** LOG of YaCy: DATA/LOG/yacy00.log (and yacy^<xx^>.log) **
|
||||
Echo ** STOP YaCy: execute stopYACY.bat and wait some seconds **
|
||||
Echo ** GET HELP for YaCy: see www.yacy-websearch.net/wiki and forum.yacy.de **
|
||||
Echo *******************************************************************************
|
||||
Echo ^>^> YaCy started as daemon process. Administration at http://localhost:%port% ^<^<
|
||||
|
||||
title YaCy - http://localhost:%port%
|
||||
|
||||
start "YaCy" %priority% /B /WAIT java %javacmd% -classpath %CLASSPATH% yacy
|
||||
|
||||
if not exist DATA\yacy.restart GoTo :END
|
||||
del DATA\yacy.restart
|
||||
GoTo :GETSTARTOPTS
|
||||
|
||||
Rem PUBLIC is now freeworld (r4575)
|
||||
:RENAMEINDEX
|
||||
|
|
@ -45,15 +57,16 @@ cd ..
|
|||
Rem This target is used to read java runtime parameters out of the yacy config file
|
||||
:GETSTARTOPTS
|
||||
for /F "tokens=1,2 delims==" %%i in (DATA\SETTINGS\yacy.conf) do (
|
||||
if "%%i"=="javastart_Xmx" set jmx=%%j
|
||||
if "%%i"=="javastart_Xms" set jms=%%j
|
||||
if "%%i"=="javastart_priority" set priolvl=%%j
|
||||
if "%%i"=="javastart_Xmx" set jmx=%%j
|
||||
if "%%i"=="javastart_Xms" set jms=%%j
|
||||
if "%%i"=="port" set port=%%j
|
||||
if "%%i"=="javastart_priority" set priolvl=%%j
|
||||
)
|
||||
if defined jmx set javacmd=-%jmx%
|
||||
if defined jms set javacmd=-%jms% %javacmd%
|
||||
if defined priolvl (
|
||||
if %priolvl% == 20 set priority=/LOW
|
||||
if %priolvl% == 10 set priority=/BELOWNORMAL
|
||||
if %priolvl% == 20 set priority=/LOW
|
||||
if %priolvl% == 10 set priority=/BELOWNORMAL
|
||||
)
|
||||
|
||||
GoTo :STARTJAVA
|
||||
39
yacy.nsi
39
yacy.nsi
|
|
@ -36,6 +36,7 @@ LicenseData "gpl.txt"
|
|||
|
||||
Section "Binaries (required)"
|
||||
SectionIn 1 2 3 RO
|
||||
Call ClearShortcuts
|
||||
SetOutPath $INSTDIR
|
||||
|
||||
File /r "RELEASE\MAIN\*"
|
||||
|
|
@ -52,12 +53,10 @@ Section "Shortcuts in the Start Menu"
|
|||
SectionIn 1 2 3
|
||||
SetShellVarContext current
|
||||
CreateDirectory "$SMPROGRAMS\YaCy"
|
||||
CreateShortCut "$SMPROGRAMS\YaCy\start YaCy.lnk" "$INSTDIR\startYACY.bat" "" "$INSTDIR\addon\YaCy.ico"
|
||||
CreateShortCut "$SMPROGRAMS\YaCy\start YaCy (no console).lnk" "$INSTDIR\startYACY_noconsole.bat" "" "$INSTDIR\addon\YaCy.ico"
|
||||
CreateShortCut "$SMPROGRAMS\YaCy\stop YaCy.lnk" "$INSTDIR\stopYACY.bat" "" "$INSTDIR\addon\YaCy.ico"
|
||||
CreateShortCut "$SMPROGRAMS\YaCy\YaCy.lnk" "$INSTDIR\startYACY.bat" "" "$INSTDIR\addon\YaCy.ico"
|
||||
CreateShortCut "$SMPROGRAMS\YaCy\stop.lnk" "$INSTDIR\stopYACY.bat" "" "$INSTDIR\addon\YaCy.ico"
|
||||
CreateShortCut "$SMPROGRAMS\YaCy\Readme.lnk" "$INSTDIR\readme.txt"
|
||||
CreateShortCut "$SMPROGRAMS\YaCy\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
|
||||
CreateShortCut "$SMPROGRAMS\YaCy\YaCy-Search.lnk" "$INSTDIR\addon\YaCy-Search.bat" "" "$INSTDIR\addon\YaCy.ico" "" SW_SHOWMINIMIZED
|
||||
SectionEnd
|
||||
|
||||
Section "YaCy on the Desktop"
|
||||
|
|
@ -66,20 +65,9 @@ Section "YaCy on the Desktop"
|
|||
CreateShortCut "$DESKTOP\YaCy.lnk" "$INSTDIR\startYACY.bat" "" "$INSTDIR\addon\YaCy.ico"
|
||||
SectionEnd
|
||||
|
||||
Section "Searchpage on the Desktop"
|
||||
SetShellVarContext current
|
||||
CreateShortCut "$DESKTOP\YaCy-Search.lnk" "$INSTDIR\addon\YaCy-Search.bat" "" "$INSTDIR\addon\YaCy.ico" "" SW_SHOWMINIMIZED
|
||||
SectionEnd
|
||||
|
||||
Section "Searchpage in the Quicklaunch"
|
||||
SectionIn 1 2 3
|
||||
SetShellVarContext current
|
||||
CreateShortCut "$QUICKLAUNCH\YaCy-Search.lnk" "$INSTDIR\addon\YaCy-Search.bat" "" "$INSTDIR\addon\YaCy.ico" "" SW_SHOWMINIMIZED
|
||||
SectionEnd
|
||||
|
||||
Section "YaCy in Startup"
|
||||
SetShellVarContext current
|
||||
CreateShortCut "$SMSTARTUP\start YaCy (no console).lnk" "$INSTDIR\startYACY_noconsole.bat" "" "$INSTDIR\addon\YaCy.ico"
|
||||
CreateShortCut "$SMSTARTUP\YaCy.lnk" "$INSTDIR\startYACY.bat" "" "$INSTDIR\addon\YaCy.ico"
|
||||
SectionEnd
|
||||
|
||||
Section "Uninstall"
|
||||
|
|
@ -110,16 +98,23 @@ Section "Uninstall"
|
|||
|
||||
;or jump to this
|
||||
keepdata:
|
||||
RMDir /r "$SMPROGRAMS\YaCy"
|
||||
Delete "$QUICKLAUNCH\YaCy-Search.lnk"
|
||||
Delete "$DESKTOP\YaCy.lnk"
|
||||
Delete "$DESKTOP\YaCy-Search.lnk"
|
||||
Delete "$SMSTARTUP\start YaCy (no console).lnk"
|
||||
Call ClearShortcuts
|
||||
|
||||
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\YaCy"
|
||||
nouninstall:
|
||||
SectionEnd
|
||||
|
||||
Function ClearShortcuts
|
||||
SetShellVarContext current
|
||||
|
||||
RMDir /r "$SMPROGRAMS\YaCy"
|
||||
Delete "$DESKTOP\YaCy.lnk"
|
||||
Delete "$SMSTARTUP\YaCy.lnk"
|
||||
Delete "$QUICKLAUNCH\YaCy-Search.lnk" ;old
|
||||
Delete "$DESKTOP\YaCy-Search.lnk" ;old
|
||||
Delete "$SMSTARTUP\start YaCy (no console).lnk" ;old
|
||||
FunctionEnd
|
||||
|
||||
Function GetJRE
|
||||
; based on http://nsis.sourceforge.net/Simple_Java_Runtime_Download_Script
|
||||
MessageBox MB_OK "YaCy uses Java ${JRE_VERSION6}. \
|
||||
|
|
@ -128,7 +123,7 @@ Function GetJRE
|
|||
userInfo::getAccountType
|
||||
Pop $0
|
||||
StrCmp $0 "Admin" +3
|
||||
MessageBox MB_ICONEXCLAMATION "You need to install Java on Administrator privileges. \
|
||||
MessageBox MB_ICONEXCLAMATION "You need Administrator privileges to install Java. \
|
||||
It will now be downloaded to the shared documents folder. \
|
||||
YaCy won't run without Java."
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user