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

Fixed indentation for better readability.

Browse Source
pull/72/head
luccioman 8 years ago
parent f3f478448b
commit 1dc4306058
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File

22
source/net/yacy/yacy.java
Unescape View File

@ -713,13 +713,17 @@ public final class yacy {
//System.out.print("args=["); for (int i = 0; i < args.length; i++) System.out.print(args[i] + ", "); System.out.println("]"); //System.out.print("args=["); for (int i = 0; i < args.length; i++) System.out.print(args[i] + ", "); System.out.println("]");
if ((args.length >= 1) && (args[0].toLowerCase().equals("-startup") || args[0].equals("-start"))) { if ((args.length >= 1) && (args[0].toLowerCase().equals("-startup") || args[0].equals("-start"))) {
// normal start-up of yacy // normal start-up of yacy
if (args.length > 1) dataRoot = new File(System.getProperty("user.home").replace('\\', '/'), args[1]); if (args.length > 1) {
preReadSavedConfigandInit(dataRoot); dataRoot = new File(System.getProperty("user.home").replace('\\', '/'), args[1]);
}
preReadSavedConfigandInit(dataRoot);
startup(dataRoot, applicationRoot, startupMemFree, startupMemTotal, false); startup(dataRoot, applicationRoot, startupMemFree, startupMemTotal, false);
} else if (args.length >= 1 && args[0].toLowerCase().equals("-gui")) { } else if (args.length >= 1 && args[0].toLowerCase().equals("-gui")) {
// start-up of yacy with gui // start-up of yacy with gui
if (args.length > 1) dataRoot = new File(System.getProperty("user.home").replace('\\', '/'), args[1]); if (args.length > 1) {
preReadSavedConfigandInit(dataRoot); dataRoot = new File(System.getProperty("user.home").replace('\\', '/'), args[1]);
}
preReadSavedConfigandInit(dataRoot);
startup(dataRoot, applicationRoot, startupMemFree, startupMemTotal, true); startup(dataRoot, applicationRoot, startupMemFree, startupMemTotal, true);
} else if ((args.length >= 1) && ((args[0].toLowerCase().equals("-shutdown")) || (args[0].equals("-stop")))) { } else if ((args.length >= 1) && ((args[0].toLowerCase().equals("-shutdown")) || (args[0].equals("-stop")))) {
// normal shutdown of yacy // normal shutdown of yacy
@ -732,7 +736,7 @@ public final class yacy {
} else if ((args.length >= 1) && (args[0].toLowerCase().equals("-version"))) { } else if ((args.length >= 1) && (args[0].toLowerCase().equals("-version"))) {
// show yacy version // show yacy version
System.out.println(copyright); System.out.println(copyright);
} else if ((args.length > 1) && (args[0].toLowerCase().equals("-config"))) { } else if ((args.length > 1) && (args[0].toLowerCase().equals("-config"))) {
// set config parameter. Special handling of adminAccount=user:pwd (generates md5 encoded password) // set config parameter. Special handling of adminAccount=user:pwd (generates md5 encoded password)
// on Windows parameter should be enclosed in doublequotes to accept = sign (e.g. -config "port=8090" "port.ssl=8043") // on Windows parameter should be enclosed in doublequotes to accept = sign (e.g. -config "port=8090" "port.ssl=8043")
File f = new File (dataRoot,"DATA/SETTINGS/"); File f = new File (dataRoot,"DATA/SETTINGS/");
@ -778,9 +782,11 @@ public final class yacy {
} }
System.out.println(); System.out.println();
} }
} else { } else {
if (args.length == 1) applicationRoot= new File(args[0]); if (args.length == 1) {
preReadSavedConfigandInit(dataRoot); applicationRoot= new File(args[0]);
}
preReadSavedConfigandInit(dataRoot);
startup(dataRoot, applicationRoot, startupMemFree, startupMemTotal, false); startup(dataRoot, applicationRoot, startupMemFree, startupMemTotal, false);
} }
} finally { } finally {

Write Preview
Loading…
Cancel
Save