X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install.sh;h=744324325fbbcb77f7d7c6921975410d210158e1;hb=4899c8f5fdb7af646ba02598786a12766688212d;hp=651ca8dfaccd35d61a9319a9b628d2ca81b9e176;hpb=9495a9e60bcb36a39aea72dde0b067d4345fa808;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh
index 651ca8d..7443243 100644
--- a/Linux/scripts/ThirdParty-install.sh
+++ b/Linux/scripts/ThirdParty-install.sh
@@ -124,6 +124,11 @@ then
   rm -rf $sourcesDir/InsightToolkit*
   rm -rf $sourcesDir/gdcm*
   rm -rf $sourcesDir/tth*
+
+  rm -rf $binDir/gdcm*
+  rm -rf $binDir/InsightToolkit*
+  rm -rf $binDir/VTK*
+
   cd $sourcesDir
   wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/vtk-5.6.1.tar.gz
   wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_08_Dic_2009.tar.gz
@@ -161,6 +166,7 @@ then
   cd ..
 fi
 
+
 if [ true = true ]
 then
   libname=gdcm
@@ -217,34 +223,23 @@ fi
 touch     $installPrefixThird/share/creatools_third_party_library_config.sh
 chmod 755 $installPrefixThird/share/creatools_third_party_library_config.sh
 
-echo export PATH='$'PATH:$installPrefixThird/bin            		>> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export VTK_DIR=$installPrefixThird/lib/vtk-5.6         		>> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export ITK_DIR=$installPrefixThird/lib/InsightToolkit  		>> $installPrefixThird/share/creatools_third_party_library_config.sh
+echo export PATH='$'PATH:$installPrefixThird/bin            	>> $installPrefixThird/share/creatools_third_party_library_config.sh
+echo export VTK_DIR=$installPrefixThird/lib/vtk-5.6         	>> $installPrefixThird/share/creatools_third_party_library_config.sh
+echo export ITK_DIR=$installPrefixThird/lib/InsightToolkit  	>> $installPrefixThird/share/creatools_third_party_library_config.sh
 echo export GDCM_DIR=$installPrefixThird/lib/gdcm            	>> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export TTH=$installPrefixThird/bin/tth     		    	>> $installPrefixThird/share/creatools_third_party_library_config.sh
+echo export TTH=$installPrefixThird/bin/tth     		>> $installPrefixThird/share/creatools_third_party_library_config.sh
 echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$GDCM_DIR  	>> $installPrefixThird/share/creatools_third_party_library_config.sh
 echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$ITK_DIR  	>> $installPrefixThird/share/creatools_third_party_library_config.sh
 echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$VTK_DIR   	>> $installPrefixThird/share/creatools_third_party_library_config.sh
 
 #  modify .bashrc
 # - remove line 'sh $installPrefixThird/share/creatools_third_party_library_config.sh' if any (with accurate value for ???)
+sed -i -e '/.*installPrefixThird*/ d' /etc/bashrc
 sed -i -e '/.*creatools_third_party_library_config.*/ d' /etc/bashrc
 
 # - add line 'sh $installPrefixThird/share/creatools_third_party_library_config.sh' (with accurate value for ???)
-echo source $installPrefixThird/share/creatools_third_party_library_config.sh >> /etc/bashrc 
-
-
+echo installPrefixThird=$installPrefix >> /etc/bashrc
+echo '[ -f "$installPrefixThird/share/creatools_third_party_library_config.sh" ] &&  source $installPrefixThird/share/creatools_third_party_library_config.sh' >> /etc/bashrc 
 
 
 
-
-
-#  modify .bashrc
-# - remove line 'sh $installPrefix/creatools_install/share/creatools_base_party_libraries_config.sh' if any (with accurate value for ???)
-sed -i -e '/.*installPrefixCreaTools*/ d' ~/.bashrc
-sed -i -e '/.*creatools_base_library_config.*/ d' ~/.bashrc
-
-# - add line 'sh $installPrefix/creatools_install/share/creatools_base_libraries_config.sh' (with accurate value for ???)
-echo installPrefixCreaTools=$installPrefix >> ~/.bashrc
-
-echo '[ -f "$installPrefixCreaTools/share/creatools_base_library_config.sh" ] &&  source $installPrefixCreaTools/share/creatools_base_library_config.sh' >> ~/.bashrc