X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FCreaTools-install.sh;h=cb415f2e21027ce7031e24644d45861dad248b0d;hb=fd2aac7e56a2ae4ecd5ed98deec488f6dbbedc1b;hp=7f6f4a80940b5117dd11b1f52a9efa60e9b74d58;hpb=05de7503f8808d9bf6930c92424db7f55e17e971;p=creaToolsTools.git

diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh
index 7f6f4a8..cb415f2 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
@@ -11,7 +35,7 @@
   then
      if [ ! -e $generationdir/creatools_install ]
      then
-     	mkdir $generationdir/creatools_install
+     	mkdir -p $generationdir/creatools_install
      fi
   else
    echo
@@ -29,45 +53,34 @@
   
   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
+
+##EED  if [ -f $installPrefix/share/creatools_base_library_config.sh ]
+##EED  then
+##EED     rm        $installPrefix/share/creatools_base_library_config.sh
+##EED  fi
+##EED  touch     $installPrefix/share/creatools_base_library_config.sh
+
+
+
+  # Install creatools as user (no longer as root) // JPR 2/5/2011
 
-  if [ -f $installPrefix/share/creatools_base_library_config.sh ]
-  then
-     rm        $installPrefix/share/creatools_base_library_config.sh
-  fi
-  touch     $installPrefix/share/creatools_base_library_config.sh
-  chmod 755 $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  
-  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 
- 
-#	      if [ ! -f /etc/bashrc ]
-#	      then
-#	         export ETC_BASHRC="/etc/bash.bashrc"
-#             else
-#                 export ETC_BASHRC="/etc/bashrc"
-#             fi
-
-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
-  
+
+  mkdir -p $installPrefix
+  mkdir -p $installPrefix/share
+  echo '## This file is call from .bashrc' > $installPrefix/share/creatools_base_library_config.sh
+  bash installmodBash.sh $installPrefix
+
   # JPR 2/5/2011
   #  modify /etc/bashrc (we cannot modify .bashrc, since we switched as root)  
   # - add line 'bash $installPrefix/creatools_install/share/creatools_base_library_config.sh'
 
   bash installmod.sh $buildType $creasource                   $generationdir  $installPrefix
   bash installmod.sh $buildType $bbtksource                   $generationdir  $installPrefix
+  bash installmod.sh $buildType $creavtksource                $generationdir  $installPrefix
   bash installmod.sh $buildType $creamaracassource            $generationdir  $installPrefix
   bash installmod.sh $buildType $creaenvironmentsource        $generationdir  $installPrefix
   bash installmod.sh $buildType $creabrukersource             $generationdir  $installPrefix
@@ -94,17 +107,22 @@ export ETC_BASHRC=$HOME/.bashrc
   bash installmodNomake.sh $buildType wx                 $generationdir  $installPrefix
   bash installmodNomake.sh $buildType wxvtk              $generationdir  $installPrefix
 
-  
+#EED  I don't know why this works here and not after the chmod 755
+#EED  bash installmodBash.sh $installPrefix
+
+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 
-
-source $installPrefix/share/creatools_base_library_config.sh
-echo "==================================================="
-echo " Regenerate Package doc"
-$installPrefix/bin/bbRegeneratePackageDoc -a -q
-echo " Regenerate Boxes list"
-$installPrefix/bin/bbRegenerateBoxesLists -q
-echo "==================================================="
+echo '[ -f "$installPrefixtmp/share/creatools_base_library_config.sh" ] &&  source $installPrefixtmp/share/creatools_base_library_config.sh $installPrefixtmp' >> $ETC_BASHRC 
+
+source $installPrefix/share/creatools_base_library_config.sh $installPrefix
+
+##EED 21/12/2014
+##EED echo "==================================================="
+##EED echo " Regenerate Package doc"
+##EED $installPrefix/bin/bbRegeneratePackageDoc -a -q
+##EED echo " Regenerate Boxes list"
+##EED $installPrefix/bin/bbRegenerateBoxesLists -q
+##EED echo "==================================================="
 
   # JPR 2/5/2011
 #else