branch develop updated (e15f6f2 -> c4a0d7d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from e15f6f2 ajustement (test refs) couleur du texte du svg new c4a0d7d refs #6544 faire fonctionner les mise à jour runtime sous windows The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c4a0d7dbdef503ec8d7a6e93fff4cdd141df873d Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 9 12:09:28 2015 +0100 refs #6544 faire fonctionner les mise à jour runtime sous windows Summary of changes: .../fr/ifremer/tutti/ui/swing/updater/Updater.java | 14 +++++++++- .../src/main/resources/update_runtime.bat | 30 ++++++++++++---------- .../src/main/resources/update_runtime.sh | 16 +++++++----- 3 files changed, 39 insertions(+), 21 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit c4a0d7dbdef503ec8d7a6e93fff4cdd141df873d Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 9 12:09:28 2015 +0100 refs #6544 faire fonctionner les mise à jour runtime sous windows --- .../fr/ifremer/tutti/ui/swing/updater/Updater.java | 14 +++++++++- .../src/main/resources/update_runtime.bat | 30 ++++++++++++---------- .../src/main/resources/update_runtime.sh | 16 +++++++----- 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/Updater.java b/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/Updater.java index 253acdb..c4b487f 100644 --- a/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/Updater.java +++ b/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/Updater.java @@ -28,10 +28,12 @@ import javax.swing.JOptionPane; import java.io.IOException; import java.io.InputStream; import java.net.URL; +import java.nio.charset.Charset; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; +import java.text.SimpleDateFormat; import java.util.Date; /** @@ -152,7 +154,17 @@ public class Updater { try (InputStream stream = resource.openStream()) { - Files.copy(stream, runtimeUpdater, StandardCopyOption.REPLACE_EXISTING); + Path tempFile = Files.createTempFile(runtimeUpdater.getFileName().toFile().getName(), null); + Files.copy(stream, tempFile, StandardCopyOption.REPLACE_EXISTING); + tempFile.toFile().deleteOnExit(); + + Charset charset = Charset.forName("UTF-8"); + String content = new String(Files.readAllBytes(tempFile), charset); + + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd_HH_mm_ss"); + content = content.replaceFirst("~~BACKUP_DATE~~", dateFormat.format(new Date())); + + Files.write(runtimeUpdater, content.getBytes()); } diff --git a/tutti-ui-swing-updater/src/main/resources/update_runtime.bat b/tutti-ui-swing-updater/src/main/resources/update_runtime.bat index 58f0b61..f7eec7b 100644 --- a/tutti-ui-swing-updater/src/main/resources/update_runtime.bat +++ b/tutti-ui-swing-updater/src/main/resources/update_runtime.bat @@ -1,32 +1,34 @@ @echo off verify on cd /d %~dp0% -set t=%time::=% -set BACKUP_DATE=%date:~6,4%%date:~3,2%%date:~0,2%%t:~0,6% -if not exist \"NEW\\jre\" goto launcher +set BACKUP_DATE=~~BACKUP_DATE~~ +if not exist NEW\\jre goto launcher 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 /Y jre \"%backupdir%\" + echo Update jre version %oldVersion% to %newVersion% old jre keep in "%backupdir%" + if not exist OLD mkdir OLD + move /Y jre "%backupdir%" move /Y NEW\\jre jre :launcher -if not exist \"NEW\\launcher\" goto end +if not exist NEW\\launcher goto end set /p oldVersion=<launcher\\version.appup set /p newVersion=<NEW\\launcher\\version.appup set backupdir=OLD\\launcher-%oldVersion%-%BACKUP_DATE% - echo Update launcher version %oldVersion% to %newVersion% old launcher keep in \"%backupdir%\" - if not exist \"OLD\" mkdir OLD + echo Update launcher version %oldVersion% to %newVersion% old launcher keep in "%backupdir%" + if not exist OLD mkdir OLD move /Y tutti.exe launcher - move /Y *.bat launcher - move /Y launcher \"%backupdir%\" + move /Y tutti*.bat launcher + move /Y launcher.jar launcher + move /Y launcher "%backupdir%" + move /Y NEW\\launcher launcher del /F /Q launcher\\*.sh - move /Y launcher\\tutti.exe tutti.exe - move /Y launcher\\tutti.bat tutti.bat - move /Y launcher\\README README + move /Y launcher\\*.exe . + move /Y launcher\\*.bat . + move /Y launcher\\launcher.jar . + move /Y launcher\\*.txt . :end if exist NEW\\jre rmdir /S /Q NEW\\jre diff --git a/tutti-ui-swing-updater/src/main/resources/update_runtime.sh b/tutti-ui-swing-updater/src/main/resources/update_runtime.sh index bc3f8f1..0acd175 100644 --- a/tutti-ui-swing-updater/src/main/resources/update_runtime.sh +++ b/tutti-ui-swing-updater/src/main/resources/update_runtime.sh @@ -1,13 +1,13 @@ #!/bin/bash -BACKUP_DATE=$(date +%Y%m%d%H%M%S) +BACKUP_DATE=~~BACKUP_DATE~~ if [ -d NEW/jre ]; then oldVersion=`cat jre/version.appup` newVersion=`cat NEW/jre/version.appup` - echo \"Update jre version $oldVersion to $newVersion\" + echo "Update jre version $oldVersion to $newVersion" mkdir -p OLD backupdir=OLD/jre-$oldVersion-$BACKUP_DATE - echo \"Backup jre old version to $backupdir\" + echo "Backup jre old version to $backupdir" mv jre $backupdir mv NEW/jre . fi @@ -20,17 +20,21 @@ fi if [ -d NEW/launcher ]; then oldVersion=`cat launcher/version.appup` newVersion=`cat NEW/launcher/version.appup` - echo \"Update launcher version $oldVersion to $newVersion\" + echo "Update launcher version $oldVersion to $newVersion" mkdir -p OLD backupdir=OLD/launcher-$oldVersion-$BACKUP_DATE - echo \"Backup launcher old version to $backupdir\" + echo "Backup launcher old version to $backupdir" mv *.sh launcher/ mv launcher $backupdir + mv NEW/launcher . rm launcher/*.exe rm launcher/*.bat + mv launcher/*.sh . - mv launcher/README . + mv launcher/*.jar . + mv launcher/README.txt . + mv launcher/LICENSE.txt . chmod +x *.sh fi -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm