X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Linux%2Fscripts%2FThirdParty-install-Finalize.sh;h=9ac09afa72366a84a5ce159f54d7c8bcd90c10f4;hb=f513924db3c927ac3c0e765731487572f25fcf1c;hp=f1d99b7fcb53b33edf497e5637238c1c9a02bb58;hpb=6f87b1df1703d46cd3a2c989110d7ac5136249d8;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install-Finalize.sh b/Linux/scripts/ThirdParty-install-Finalize.sh
index f1d99b7..9ac09af 100644
--- a/Linux/scripts/ThirdParty-install-Finalize.sh
+++ b/Linux/scripts/ThirdParty-install-Finalize.sh
@@ -62,21 +62,22 @@ 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.10        >> $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 installPrefixThird='$1'   											>> $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.10        	>> $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
 
 if [ $OperatingSystem = "MacOS" ]
 then
-   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$GDCM_DIR   >> $installPrefixThird/share/creatools_third_party_library_config.sh
-   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$ITK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
-   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$VTK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
+   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'GDCM_DIR   >> $installPrefixThird/share/creatools_third_party_library_config.sh
+   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'ITK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
+   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'VTK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
 else
-   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
+   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
 fi
 
    sed -i -e '/.*installPrefixThird*/ d' $ETC_BASHRC
@@ -86,7 +87,9 @@ fi
 
 echo "====================================================ETC_BASHRC "  $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 
+echo '[ -f "$installPrefixThird/share/creatools_third_party_library_config.sh" ] &&  source $installPrefixThird/share/creatools_third_party_library_config.sh $installPrefixThird' >> $ETC_BASHRC 
 
 chown -R $loginUserName  $generationdir
 chgrp -R $loginGroupName $generationdir
+
+source ~/.bashrc