Author: bpoussin Date: 2013-02-01 16:06:29 +0100 (Fri, 01 Feb 2013) New Revision: 291 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/291 Log: modif date script shell implantation script bat Modified: trunk/tutti-ui-swing/src/main/assembly/full/tutti.bat trunk/tutti-ui-swing/src/main/assembly/min/launch.bat trunk/tutti-ui-swing/src/main/assembly/min/update.bat trunk/tutti-ui-swing/src/main/assembly/min/update.sh Modified: trunk/tutti-ui-swing/src/main/assembly/full/tutti.bat =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/full/tutti.bat 2013-02-01 14:22:46 UTC (rev 290) +++ trunk/tutti-ui-swing/src/main/assembly/full/tutti.bat 2013-02-01 15:06:29 UTC (rev 291) @@ -0,0 +1,19 @@ +@echo off + +set OLDDIR=%CD% +cd /d %~dp0% +set REP=%CD% + +set JAVA_HOME=%REP%\jre +set JAVA_COMMAND=%JAVA_HOME%\bin\java + +echo current dir=%REP% and JAVA_HOME=%JAVA_HOME% + +:start + +copy tutti-app\update.bat . +call update.bat +call tutti-app\launch.bat --option tutti.launch.mode=full +if errorlevel 88 goto start + +cd %OLDDIR% Modified: trunk/tutti-ui-swing/src/main/assembly/min/launch.bat =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/min/launch.bat 2013-02-01 14:22:46 UTC (rev 290) +++ trunk/tutti-ui-swing/src/main/assembly/min/launch.bat 2013-02-01 15:06:29 UTC (rev 291) @@ -1,2 +1,11 @@ +@echo off -java -Xmx1024M -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 +set OLDDIR=%CD% +cd /d %~dp0% + +echo lauch java +%JAVA_COMMAND% -Xmx1024M -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 +set exitcode=%ERRORLEVEL% +echo Stop Tutti with exitcode: %exitcode% +cd %OLDDIR% +exit /b %exitcode% Modified: trunk/tutti-ui-swing/src/main/assembly/min/update.bat =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/min/update.bat 2013-02-01 14:22:46 UTC (rev 290) +++ trunk/tutti-ui-swing/src/main/assembly/min/update.bat 2013-02-01 15:06:29 UTC (rev 291) @@ -0,0 +1,31 @@ +@echo off + +set t=%time::=% +set BACKUP_DATE=%date:~6,4%%date:~3,2%%date:~0,2%%t:~0,6% + +if not exist "NEW\jre" goto tutti + +rem deplacement de l'ancienne jre +set /p oldVersion=<jre\version.appup +set /p newVersion=<NEW\jre\version.appup +set backupdir=OLD\jre-%oldVersion: =%-%BACKUP_DATE: =% +echo Update jre version %oldVersion: =% to %newVersion: =% old jre keep in "%backupdir%" +if not exist "OLD" mkdir OLD +move jre "%backupdir%" +move NEW\jre jre + +:tutti + +if not exist "NEW\tutti-app" goto end + +rem deplacement de l'ancien tutti +set /p oldVersion=<tutti-app\version.appup +set /p newVersion=<NEW\tutti-app\version.appup +set backupdir=OLD\tutti-app-%oldVersion: =%-%BACKUP_DATE: =% +echo Update tutti-app version %oldVersion: =% to %newVersion: =% old jre keep in "%backupdir%" +if not exist "OLD" mkdir OLD +move tutti-app "%backupdir%" +move NEW\tutti-app tutti-app + + +:end Modified: trunk/tutti-ui-swing/src/main/assembly/min/update.sh =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/min/update.sh 2013-02-01 14:22:46 UTC (rev 290) +++ trunk/tutti-ui-swing/src/main/assembly/min/update.sh 2013-02-01 15:06:29 UTC (rev 291) @@ -1,11 +1,11 @@ #!/bin/bash -BACKUP_DATE=$(date -d %Y-%j) +BACKUP_DATE=$(date +%Y%m%d%H%M%S) if [ -d NEW/jre ]; then oldVersion=`cat jre/version.appup` newVersion=`cat NEW/jre/version.appup` echo "Update jre version $oldVersion to $newVersion" - mkdir OLD + mkdir -p OLD backupdir=OLD/jre-$oldVersion-$BACKUP_DATE echo "Backup jre old version to $backupDir" #mv jre $backupDir @@ -16,7 +16,7 @@ oldVersion=`cat tutti-app/version.appup` newVersion=`cat NEW/tutti-app/version.appup` echo "Update tutti version $oldVersion to $newVersion" - mkdir OLD + mkdir -p OLD backupdir=OLD/tutti-app-$oldVersion-$BACKUP_DATE echo "Backup tutti old version to $backupDir" #mv tutti-app $backupDir