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

diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh
index 4a37bb3..cb415f2 100644
--- a/Linux/scripts/CreaTools-install.sh
+++ b/Linux/scripts/CreaTools-install.sh
@@ -35,7 +35,7 @@
   then
      if [ ! -e $generationdir/creatools_install ]
      then
-     	mkdir $generationdir/creatools_install
+     	mkdir -p $generationdir/creatools_install
      fi
   else
    echo
@@ -55,28 +55,25 @@
 
   #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
-     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
+##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
 
   # - 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'
@@ -111,26 +108,21 @@
   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
-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
+#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