Author: tchemit Date: 2014-01-13 16:18:31 +0100 (Mon, 13 Jan 2014) New Revision: 1484 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1484 Log: fixes #4126: [TECH] Am?\195?\169lioration des logs au d?\195?\169marrage Modified: trunk/tutti-ui-swing/src/main/assembly/full/tutti.bat trunk/tutti-ui-swing/src/main/assembly/full/tutti.sh trunk/tutti-ui-swing/src/main/assembly/min/launch.bat trunk/tutti-ui-swing/src/main/assembly/min/launch.sh Modified: trunk/tutti-ui-swing/src/main/assembly/full/tutti.bat =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/full/tutti.bat 2014-01-12 13:44:33 UTC (rev 1483) +++ trunk/tutti-ui-swing/src/main/assembly/full/tutti.bat 2014-01-13 15:18:31 UTC (rev 1484) @@ -8,16 +8,19 @@ set JAVA_COMMAND=%JAVA_HOME%\bin\java set TUTTI_LOG_FILE=%TUTTI_BASEDIR%\data\tutti-${project.version}.log -echo "tutti basedir: %TUTTI_BASEDIR%" -echo "tutti jre home: %JAVA_HOME%" -echo "tutti log file: %TUTTI_LOG_FILE%" +echo Allegro Campaign basedir: %TUTTI_BASEDIR% +echo Allegro Campaign app home: %TUTTI_HOME% +echo Allegro Campaign jre home: %JAVA_HOME% +echo Allegro Campaign log file: %TUTTI_LOG_FILE% :start -copy tutti\update.bat . +copy tutti\update.bat . +echo Searching for updates... call update.bat del update.bat -copy tutti.config tutti +if exist "tutti.config" copy tutti.config tutti +echo Allegro Campaign ${project.version} is starting... call tutti\launch.bat --option tutti.launch.mode full --option tutti.basedir %TUTTI_BASEDIR% if errorlevel 89 goto deletedb if errorlevel 88 goto start Modified: trunk/tutti-ui-swing/src/main/assembly/full/tutti.sh =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/full/tutti.sh 2014-01-12 13:44:33 UTC (rev 1483) +++ trunk/tutti-ui-swing/src/main/assembly/full/tutti.sh 2014-01-13 15:18:31 UTC (rev 1484) @@ -8,17 +8,21 @@ cd $TUTTI_BASEDIR -echo "tutti basedir: $TUTTI_BASEDIR" -echo "tutti app home: $TUTTI_HOME" -echo "tutti jre home: $JAVA_HOME" -echo "tutti log file: $TUTTI_LOG_FILE" +echo "Allegro Campaign basedir: $TUTTI_BASEDIR" +echo "Allegro Campaign app home: $TUTTI_HOME" +echo "Allegro Campaign jre home: $JAVA_HOME" +echo "Allegro Campaign log file: $TUTTI_LOG_FILE" while true; do cp $TUTTI_HOME/update.sh . + echo "Searching for updates..." ./update.sh - rm -fv update.sh - cp $TUTTI_BASEDIR/tutti.config $TUTTI_HOME + rm -f update.sh + if [ -f $TUTTI_BASEDIR/tutti.config ]; then + cp -rfv $TUTTI_BASEDIR/tutti.config $TUTTI_HOME + fi + echo "Allegro Campaign ${project.version} is starting..." ./tutti/launch.sh --option tutti.launch.mode full --option tutti.basedir $TUTTI_BASEDIR exitcode=$? Modified: trunk/tutti-ui-swing/src/main/assembly/min/launch.bat =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/min/launch.bat 2014-01-12 13:44:33 UTC (rev 1483) +++ trunk/tutti-ui-swing/src/main/assembly/min/launch.bat 2014-01-13 15:18:31 UTC (rev 1484) @@ -3,9 +3,8 @@ set OLDDIR=%CD% cd /d %~dp0% -echo lauch java %JAVA_COMMAND% -Xmx1024M -XX:MaxPermSize=128M -Dtutti.log.file=%TUTTI_LOG_FILE% -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 set exitcode=%ERRORLEVEL% -echo Stop Tutti with exitcode: %exitcode% +echo Stop Allegro Campaign with exitcode: %exitcode% cd %OLDDIR% exit /b %exitcode% Modified: trunk/tutti-ui-swing/src/main/assembly/min/launch.sh =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/min/launch.sh 2014-01-12 13:44:33 UTC (rev 1483) +++ trunk/tutti-ui-swing/src/main/assembly/min/launch.sh 2014-01-13 15:18:31 UTC (rev 1484) @@ -7,9 +7,9 @@ cd $REP -echo "java command: $JAVA_COMMAND" +#echo "java command: $JAVA_COMMAND" $JAVA_COMMAND $MEMORY $TUTTI_JVM_OPTS -Dtutti.log.file=$TUTTI_LOG_FILE -jar ${project.build.finalName}.${project.packaging} $* exitcode=$? -echo "Stop Tutti with exitcode: $exitcode" +echo "Stop Allegro Campaign with exitcode: $exitcode" exit $exitcode