X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FCreaTools-install.sh;h=430b0b6a2809cd581b0304b898b2284358f28810;hb=66d0ff9308ef77332f9081e590c8e3e7d198f8f5;hp=6aa4b0a9f6dcedcf18861ecfe4875b17f90a4f89;hpb=b5be1437c10d1c194cc5c16ec8aee2b8a0edc64b;p=creaToolsTools.git diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh index 6aa4b0a..430b0b6 100644 --- a/Linux/scripts/CreaTools-install.sh +++ b/Linux/scripts/CreaTools-install.sh @@ -37,15 +37,7 @@ 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 @@ -94,6 +86,17 @@ fi 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 + 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 + + 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