X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install.sh;h=08a7c2128e415758ff43e26d7df9002b22743293;hb=d41e4c024be4d3a4500f537b8a2d144e4341e3b2;hp=836c0af6f8c8af7e2ddeb5c7a16fa3acaffc0010;hpb=05abe3279dd77f37c98a79f508cd2ba9b66ff395;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh
index 836c0af..08a7c21 100644
--- a/Linux/scripts/ThirdParty-install.sh
+++ b/Linux/scripts/ThirdParty-install.sh
@@ -45,7 +45,15 @@ binDir=$generationdir/thirdparty_bin
 if [ ! -e $generationdir ]
 then
    mkdir $generationdir
+   chown $loginUserName:$loginGroupName $generationdir
+fi
+if [ ! -e $sourcesDir ]
+then
    mkdir $sourcesDir
+fi
+
+if [ ! -e $binDir ]
+then
    mkdir $binDir
 fi
 
@@ -124,6 +132,10 @@ 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
@@ -150,6 +162,7 @@ then
   dirInstall=$binDir/$libname-Bin
   dirInstallVTK=$dirInstall
   export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
+  mkdir $dirInstall
   cd $dirInstall
  
   cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
@@ -218,11 +231,11 @@ 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
@@ -233,7 +246,7 @@ 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 installPrefixThird=$installPrefix >> /etc/bashrc
+echo installPrefixThird=$installPrefixThird >> /etc/bashrc
 echo '[ -f "$installPrefixThird/share/creatools_third_party_library_config.sh" ] &&  source $installPrefixThird/share/creatools_third_party_library_config.sh' >> /etc/bashrc