X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FCreaTools-install.sh;h=5d12ba5df8fcc4e00956088aa7920368c3a784b6;hb=42a2882bd2ad34aa34b2b4dec6a3d2939ffe8454;hp=776d170c7859a415796209e8dd236d16e494f75b;hpb=5ceecf6dda6a78fc6cefb8e9f8774f2a287a3729;p=creaToolsTools.git diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh index 776d170..5d12ba5 100644 --- a/Linux/scripts/CreaTools-install.sh +++ b/Linux/scripts/CreaTools-install.sh @@ -37,10 +37,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 - + 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 + # - 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 @@ -78,7 +86,7 @@ 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 @@ -88,7 +96,6 @@ else 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