X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Linux%2Fscripts%2FThirdParty-install.sh;h=a3ffec9c1dce34371e27d6273b4f063a556968ac;hb=e2e07fb5d198954413febded04915426111690b7;hp=3b71a4707e2717b665ad8059ed7926ee6dbbc9ae;hpb=9855e3b70d5b519d697d6eba6d462118565c3698;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh
index 3b71a47..a3ffec9 100644
--- a/Linux/scripts/ThirdParty-install.sh
+++ b/Linux/scripts/ThirdParty-install.sh
@@ -1,4 +1,29 @@
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------  
+
+
 #!/bin/bash
+
  if [ ! -f $PWD/scripts/CreaTools-configure.sh ]
  then 
    echo
@@ -11,7 +36,7 @@
    echo
    echo
    exit 0
-fi 
+fi
 echo $loginGroupName
 
 source $PWD/scripts/CreaTools-configure.sh
@@ -21,7 +46,7 @@ source $PWD/scripts/CreaTools-configure.sh
    echo --generationdir--
    echo $generationdir
    echo --corenumber--
-   echo $corenumber   
+   echo $corenumber
    echo --docgeneration--
    echo $docgeneration
    echo --installPrefix--
@@ -32,6 +57,8 @@ source $PWD/scripts/CreaTools-configure.sh
    echo $buildType
    echo --gdcmVersion--
    echo $gdcmVersion
+   echo "--ETC_BASHRC--"
+   echo $ETC_BASHRC  
 #   echo --sourcesFrom--
 #   echo $sourcesFrom
 #   echo --scriptDir--
@@ -40,52 +67,47 @@ source $PWD/scripts/CreaTools-configure.sh
 #   echo $start_point
    echo "------"
 
-
 scriptDir=$PWD
 sourcesDir=$generationdir/thirdparty_sources
 binDir=$generationdir/thirdparty_bin
 
 if [ ! -e $generationdir ]
 then
-   mkdir $generationdir
-   chown $loginUserName  $generationdir
-   chgrp $loginGroupName $generationdir
-
+   mkdir -p $generationdir
+   chown -R $loginUserName  $generationdir
+   chgrp -R $loginGroupName $generationdir
 fi
+
 if [ ! -e $sourcesDir ]
 then
-   mkdir $sourcesDir
+   mkdir -p $sourcesDir
    #was : (pb on MacOS?)
-   #chown $loginUserName:$loginGroupName $sourcesDir
-   chown $loginUserName  $sourcesDir
-   chgrp $loginGroupName $sourcesDir
+   #chown -R $loginUserName:$loginGroupName $sourcesDir
+   chown -R $loginUserName  $sourcesDir
+   chgrp -R $loginGroupName $sourcesDir
 fi
 
 if [ ! -e $binDir ]
 then
-   mkdir $binDir
-   chown $loginUserName  $binDir
-   chgrp $loginGroupName $binDir
+   mkdir -p $binDir
+   chown -R $loginUserName  $binDir
+   chgrp -R $loginGroupName $binDir
 fi
 
 
-
 # Third Party base stuff is now installed by ThirdParty-install-Base-Stuff.sh   JPR
 
 
-
-
 # the following stupid test is used at debug time; Please don't remove!
 #if [ true = false ]
 if [ true = true ]
 then
-
   rm -rf $sourcesDir/tth*
 
   cd $sourcesDir
 
- if [ $OperatingSystem = "MacOS" ]
-   then	  
+  if [ $OperatingSystem = "MacOS" ]
+  then
     # curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
     # curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
     # curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.tar.gz
@@ -101,8 +123,8 @@ then
     wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_Developer_Tools/All_Versions/tth/tth_linux/tth
   
     # tar -xvzf VTK-5.6.1.patchCreatis.tar.gz
-     #tar -xvzf gdcm_05_Mai_2011.tar.gz
-     #tar -xvzf InsightToolkit-3.20.0.tar.gz
+    #tar -xvzf gdcm_05_Mai_2011.tar.gz
+    #tar -xvzf InsightToolkit-3.20.0.tar.gz
   fi
 
 fi
@@ -115,11 +137,11 @@ else
    debug="OFF"
 fi
 
-
 #if [ true = false ]
 if [ true = true ]
 then
   cd $sourcesDir
  # pourquoi ne copie-t-on plus? JPR
+ mkdir -p $installPrefixThird/bin
  cp tth $installPrefixThird/bin
 fi