fixed windows installer; updated download path for java installer

1 files changed, 23 insertions, 21 deletions

diff --git a/startYACY_debug.bat b/startYACY_debug.bat
index 1ff4ae817..d15fc415a 100644
--- a/startYACY_debug.bat
+++ b/startYACY_debug.bat
@@ -1,7 +1,10 @@
 @Echo Off

 title YaCy

 

-if exist DATA\yacy.noconsole del DATA\yacy.noconsole

+if "%YACY_DATA%"=="" set "YACY_DATA=%LOCALAPPDATA%\YaCy"
+set "YACY_DATA_DIR=%YACY_DATA%\DATA"
+if not exist "%YACY_DATA_DIR%" md "%YACY_DATA_DIR%"
+if exist "%YACY_DATA_DIR%\yacy.noconsole" del "%YACY_DATA_DIR%\yacy.noconsole"
 

 Rem Generating the proper classpath unsing loops and labels

 Set CLASSPATH=lib/yacycore.jar

@@ -13,11 +16,11 @@ set javacmd=-Xmx600m
 set priolvl=10

 set priority=/BELOWNORMAL

 set port=8090

-if exist DATA\SETTINGS\httpProxy.conf GoTo :RENAMEINDEX

-if exist DATA\SETTINGS\yacy.conf GoTo :GETSTARTOPTS

+if exist "%YACY_DATA_DIR%\SETTINGS\httpProxy.conf" GoTo :RENAMEINDEX
+if exist "%YACY_DATA_DIR%\SETTINGS\yacy.conf" GoTo :GETSTARTOPTS
 

 :STARTJAVA

-set javacmd=%javacmd% -XX:-UseGCOverheadLimit -Djava.awt.headless=true -Dfile.encoding=UTF-8

+set javacmd=%javacmd% -XX:-UseGCOverheadLimit -Djava.awt.headless=true -Dfile.encoding=UTF-8
 

 Rem Starting YaCy

 Echo Generated classpath:%CLASSPATH%

@@ -27,7 +30,7 @@ Echo Priority:%priority%
 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: https://yacy.net/  ****

-Echo **  LOG of       YaCy: DATA/LOG/yacy00.log (and yacy^<xx^>.log)              **

+Echo **  LOG of       YaCy: %YACY_DATA_DIR%/LOG/yacy00.log (and yacy^<xx^>.log)              **
 Echo **  STOP         YaCy: execute stopYACY.bat and wait some seconds            **

 Echo **  GET HELP for YaCy: join our community at https://community.searchlab.eu  **

 Echo *******************************************************************************

@@ -39,30 +42,29 @@ Rem commandline parameter added for -config option, like -config "port=8090" "ad
 Rem special parameter "adminAccount=admin:password" calculates and sets new admin-pwd

 Rem any parameter in yacy.conf can me modified this way (make sure to use correct upper/lower case)

 

-start "YaCy" %priority% /B /WAIT java %javacmd% -classpath %CLASSPATH% net.yacy.yacy %1 %2 %3 %4 %5 %6 %7 %8 %9

+start "YaCy" %priority% /B /WAIT java %javacmd% -Dyacy.data="%YACY_DATA%" -classpath %CLASSPATH% net.yacy.yacy %1 %2 %3 %4 %5 %6 %7 %8 %9
 

-if not exist DATA\yacy.restart GoTo :END

-del DATA\yacy.restart

+if not exist "%YACY_DATA_DIR%\yacy.restart" GoTo :END
+del "%YACY_DATA_DIR%\yacy.restart"
 GoTo :GETSTARTOPTS

 

 Rem PUBLIC is now freeworld (r4575)

 :RENAMEINDEX

-for /F "tokens=1,2 delims==" %%i in (DATA\SETTINGS\httpProxy.conf) do (

-    if "%%i"=="network.unit.name" set networkname=%%j

-)

-if not defined networkname set networkname=PUBLIC

-cd DATA\INDEX

-ren PUBLIC %networkname%

-cd ..

-cd ..

+for /F "usebackq tokens=1,2 delims==" %%i in ("%YACY_DATA_DIR%\SETTINGS\httpProxy.conf") do (
+    if "%%i"=="network.unit.name" set networkname=%%j
+)
+if not defined networkname set networkname=PUBLIC
+pushd "%YACY_DATA_DIR%\INDEX"
+ren PUBLIC %networkname%
+popd
 

 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"=="port" set port=%%j

-    if "%%i"=="javastart_priority" set priolvl=%%j

-)

+for /F "usebackq tokens=1,2 delims==" %%i in ("%YACY_DATA_DIR%\SETTINGS\yacy.conf") do (
+    if "%%i"=="javastart_Xmx" set jmx=%%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 (