Skip to content

Commit

Permalink
* fix if yacy was installed to a path with whitespace
Browse files Browse the repository at this point in the history 
* show nice dots when waiting for restart/update

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5110 6c8d7289-2bf4-0310-a012-ef5d649a1542
  • Loading branch information
lotus committed Sep 3, 2008
1 parent fc03b04 commit 423a89e
Showing 1 changed file with 15 additions and 9 deletions.
24 changes: 15 additions & 9 deletions source/de/anomic/yacy/yacyVersion.java
View file
Expand Up @@ -389,13 +389,16 @@ public static void restart() {
final String script =
"@echo off" + serverCore.LF_STRING +
"title YaCy restarter" + serverCore.LF_STRING +
"echo YACY RESTARTER" + serverCore.LF_STRING +
"echo working..." + serverCore.LF_STRING +
"cd " + apphome + "/DATA/RELEASE/".replace("/", File.separator) + serverCore.LF_STRING +
"set loading=YACY RESTARTER" + serverCore.LF_STRING +
"echo %loading%" + serverCore.LF_STRING +
"cd \"" + apphome + "/DATA/RELEASE/".replace("/", File.separator) + "\"" + serverCore.LF_STRING +
":WAIT" + serverCore.LF_STRING +
"set loading=%loading%." + serverCore.LF_STRING +
"cls" + serverCore.LF_STRING +
"echo %loading%" + serverCore.LF_STRING +
"ping -n 2 127.0.0.1 >nul" + serverCore.LF_STRING +
"IF exist ..\\yacy.running goto WAIT" + serverCore.LF_STRING +
"cd " + apphome + serverCore.LF_STRING +
"cd \"" + apphome + "\"" + serverCore.LF_STRING +
"start /MIN CMD /C " + starterFile + serverCore.LF_STRING;
final File scriptFile = new File(sb.getRootPath(), "DATA/RELEASE/restart.bat".replace("/", File.separator));
serverSystem.deployScript(scriptFile, script);
Expand Down Expand Up @@ -464,17 +467,20 @@ public static void deployRelease(final File releaseFile) {
script =
"@echo off" + serverCore.LF_STRING +
"title YaCy updater" + serverCore.LF_STRING +
"echo YACY UPDATER" + serverCore.LF_STRING +
"echo working..." + serverCore.LF_STRING +
"cd " + apphome + "/DATA/RELEASE/".replace("/", File.separator) + serverCore.LF_STRING +
"set loading=YACY UPDATER" + serverCore.LF_STRING +
"echo %loading%" + serverCore.LF_STRING +
"cd \"" + apphome + "/DATA/RELEASE/".replace("/", File.separator) + "\"" + serverCore.LF_STRING +

":WAIT" + serverCore.LF_STRING +
"set loading=%loading%." + serverCore.LF_STRING +
"cls" + serverCore.LF_STRING +
"echo %loading%" + serverCore.LF_STRING +
"ping -n 2 127.0.0.1 >nul" + serverCore.LF_STRING +
"IF exist ..\\yacy.running goto WAIT" + serverCore.LF_STRING +
"IF not exist yacy goto NODATA" + serverCore.LF_STRING +

"cd yacy" + serverCore.LF_STRING +
"xcopy *.* " + apphome + " /E /Y >nul" + serverCore.LF_STRING +
"xcopy *.* \"" + apphome + "\" /E /Y >nul" + serverCore.LF_STRING +
// /E - all subdirectories
// /Y - don't ask
"cd .." + serverCore.LF_STRING +
Expand All @@ -488,7 +494,7 @@ public static void deployRelease(final File releaseFile) {
"pause" + serverCore.LF_STRING +

":END" + serverCore.LF_STRING +
"cd " + apphome + serverCore.LF_STRING +
"cd \"" + apphome + "\"" + serverCore.LF_STRING +
"start /MIN CMD /C " + starterFile + serverCore.LF_STRING;
scriptFileName = "update.bat";
} else { // unix/linux
Expand Down

0 comments on commit 423a89e

Please sign in to comment.