X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Linux%2Fscripts%2FCreaTools-install.sh;h=29b639dc838bb24ff5a4163e64c18b5264593581;hb=74c39dff7bad2a793f7dbad0b1636e0ca12fe514;hp=430b0b6a2809cd581b0304b898b2284358f28810;hpb=66d0ff9308ef77332f9081e590c8e3e7d198f8f5;p=creaToolsTools.git

diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh
index 430b0b6..29b639d 100644
--- a/Linux/scripts/CreaTools-install.sh
+++ b/Linux/scripts/CreaTools-install.sh
@@ -1,3 +1,27 @@
+# ---------------------------------------------------------------------
+#
+# 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
 
 # JPR 2/5/2011
@@ -29,7 +53,7 @@
   
   cd $scriptDir
 
-#create creatools_base_library_config.sh  at the very begining, so we can write "export xxx_BIN=..." inside installmod.sh. JPRx 3 mars 2011
+  #create creatools_base_library_config.sh  at the very begining, so we can write "export xxx_BIN=..." inside installmod.sh. JPRx 3 mars 2011
 
   if [ -f $installPrefix/share/creatools_base_library_config.sh ]
   then
@@ -37,19 +61,18 @@
   fi
   touch     $installPrefix/share/creatools_base_library_config.sh
   chmod 755 $installPrefix/share/creatools_base_library_config.sh
-
   
-# Install creatools as user (no longer as root) // JPR 2/5/2011 
- 
-#	      if [ ! -f /etc/bashrc ]
-#	      then
-#	         export ETC_BASHRC="/etc/bash.bashrc"
-#             else
-#                 export ETC_BASHRC="/etc/bashrc"
-#             fi
+  echo export PATH='$'PATH:$installPrefix/bin                                   >> $installPrefix/share/creatools_base_library_config.sh
+  if [ $OperatingSystem = "MacOS" ]
+  then
+     echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$installPrefix/lib/creatools   >> $installPrefix/share/creatools_base_library_config.sh
+  else
+     echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib/creatools   >> $installPrefix/share/creatools_base_library_config.sh
+     echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib64/creatools >> $installPrefix/share/creatools_base_library_config.sh
+  fi
+
+  # Install creatools as user (no longer as root) // JPR 2/5/2011
 
-# export ETC_BASHRC=$HOME/.bashrc
-	      
   # - remove line 'bash $installPrefix/creatools_install/share/creatools_base_library_config.sh' if any
   sed -i -e '/.*creatools_base_library_config.*/ d' $ETC_BASHRC
   sed -i -e '/installPrefixtmp*/ d' $ETC_BASHRC
@@ -87,16 +110,15 @@
   bash installmodNomake.sh $buildType wxvtk              $generationdir  $installPrefix
 
 #EED  I don't know why this works here and not after the chmod 755
-  echo export PATH='$'PATH:$installPrefix/bin                                   >> $installPrefix/share/creatools_base_library_config.sh
+echo export PATH='$'PATH:$installPrefix/bin                                   >> $installPrefix/share/creatools_base_library_config.sh
 if [ $OperatingSystem = "MacOS" ]
 then
   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$installPrefix/lib/creatools   >> $installPrefix/share/creatools_base_library_config.sh
-else  
+else
   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib/creatools   >> $installPrefix/share/creatools_base_library_config.sh
   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib64/creatools >> $installPrefix/share/creatools_base_library_config.sh
 fi
 
-
 echo "===================================================in CreaTools-install.sh ETC_BASHRC : "  $ETC_BASHRC 
 echo installPrefixtmp=$installPrefix >> $ETC_BASHRC
 echo '[ -f "$installPrefixtmp/share/creatools_base_library_config.sh" ] &&  source $installPrefixtmp/share/creatools_base_library_config.sh' >> $ETC_BASHRC