From 204d9b8ff80ddf846bbf709280a3e24fbd6db1c5 Mon Sep 17 00:00:00 2001
From: Eduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Date: Fri, 15 Dec 2017 11:35:37 +0100
Subject: [PATCH] #3159	CreaTools	Feature	New	Normal	Update
 Creatools

---
 bin/UpdateCreatools.bat  | 48 +++++-----------------------------------
 bin/UpdateCreatools_.bat | 47 +++++++++++++++++++++++++++++++++++++++
 install/CMakeLists.txt   |  2 ++
 3 files changed, 54 insertions(+), 43 deletions(-)
 create mode 100644 bin/UpdateCreatools_.bat

diff --git a/bin/UpdateCreatools.bat b/bin/UpdateCreatools.bat
index 94dc466..ec2f1fa 100644
--- a/bin/UpdateCreatools.bat
+++ b/bin/UpdateCreatools.bat
@@ -1,51 +1,13 @@
-echo OFF
-"C:\Program Files (x86)\CreaTools-2.6.5"\Uninstall.exe /S
+rem echo OFF
 
 set DOWNLOADDIR=Downloads
-set URL=http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/v2.6.x
-set FILENAME=CreaTools-Release-2.6.5-win64.exe 
-
+set FILENAME=UpdateCreatools_.bat
+set CREATOOLSPATH="C:\Program Files (x86)\CreaTools-2.6.5"
 cd %USERPROFILE%
 mkdir %DOWNLOADDIR%
 cd %DOWNLOADDIR%
 
-call bitsadmin /NOWRAP /transfer creatools  /download /priority normal  %URL%/%FILENAME% %USERPROFILE%\%DOWNLOADDIR%\%FILENAME%
-
-echo .
-echo .
-echo .
-echo .
-echo .
-echo .
-echo .
-echo .
-echo Installing   %FILENAME% ....
-echo .
-echo .
-echo .
-echo .
-echo .
-echo .
-echo .
-echo .
-%FILENAME% /S
+copy %CREATOOLSPATH%\bin\%FILENAME% %FILENAME%
+call %FILENAME%
 
-cls
-echo .
-echo .
-echo .
-echo .
-echo .
-echo .
-echo .
-echo .
-echo ....   %FILENAME%    ....
-echo .
-echo .
-echo .      Finish Update. 
-echo .
-echo .
-echo .
-echo .
-echo .
 pause
\ No newline at end of file
diff --git a/bin/UpdateCreatools_.bat b/bin/UpdateCreatools_.bat
new file mode 100644
index 0000000..58ee637
--- /dev/null
+++ b/bin/UpdateCreatools_.bat
@@ -0,0 +1,47 @@
+echo OFF
+set CREATOOLSPATH="C:\Program Files (x86)\CreaTools-2.6.5"
+set FILENAME=CreaTools-Release-2.6.5-win64.exe 
+set URL=http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/v2.6.x
+set DOWNLOADDIR=Downloads
+cd %USERPROFILE%
+mkdir %DOWNLOADDIR%
+cd %DOWNLOADDIR%
+%CREATOOLSPATH%\Uninstall.exe /S
+bitsadmin /NOWRAP /transfer creatools  /download /priority normal  %URL%/%FILENAME% %USERPROFILE%\%DOWNLOADDIR%\%FILENAME%
+echo .
+echo .
+echo .
+echo .
+echo .
+echo .
+echo .
+echo .
+echo Installing   %FILENAME% ....
+echo .
+echo .
+echo .
+echo .
+echo .
+echo .
+echo .
+echo .
+%FILENAME% /S
+cls
+echo .
+echo .
+echo .
+echo .
+echo .
+echo .
+echo .
+echo .
+echo ....   %FILENAME%    ....
+echo .
+echo .
+echo .      Finish Update. 
+echo .
+echo .
+echo .
+echo .
+echo .
+pause
\ No newline at end of file
diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index 0fdc5c5..c27a55b 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -132,6 +132,7 @@ IF(WIN32 AND NOT UNIX)
 
 		SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 'STR:Environment' /TIMEOUT=5000 
 
+		CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Update_CreaTools.lnk' '${CREATOOLS_DIRBIN}\\\\UpdateCreatools.bat.lnk' 
 		CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\CreaTools_HomePage.lnk' '${CREATOOLS_DIRBIN}\\\\start.bat'  'www.creatis.insa-lyon.fr/site/creatools'
 		CreateShortCut  '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\CreaTools.lnk' '${CREATOOLS_DIRBIN}\\\\creatis_AppGeneralPath.bat'  'bbi.exe bbs\\\\creaMiniTools\\\\appli\\\\minitoolsMenu.bbs'
 
@@ -169,6 +170,7 @@ IF(WIN32 AND NOT UNIX)
 		Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\CreaTools_HomePage.lnk'
 		Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\ creaTools.lnk'
 		Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Version.txt.lnk'
+		Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Update_CreaTools.lnk'
 		
 #		Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Developer_Tools\\\\creaNewProject.lnk'
 #		Delete '$SMPROGRAMS\\\\$MUI_TEMP\\\\Developer_Tools\\\\bbStudio.lnk'
-- 
2.47.1