diff --git a/bash_profile.d/00_base.sh b/bash_profile.d/00_base.sh index 8287306..53f8f2d 100644 --- a/bash_profile.d/00_base.sh +++ b/bash_profile.d/00_base.sh @@ -1,10 +1,7 @@ #!/bin/bash -export PREFIX=$HOME/local/ if [ $(uname) == "Linux" ]; then { - export LD_LIBRARY_PATH=$PREFIX/lib/:$LD_LIBRARY_PATH - alias l='ls -l --color=always --time-style=+%F%t%T' alias ll='l -a' alias lt='l -at' @@ -12,8 +9,6 @@ if [ $(uname) == "Linux" ]; then { } fi if [ $(uname) == "Darwin" ]; then { - export DYLD_LIBRARY_PATH=$PREFIX/lib/:$DYLD_LIBRARY_PATH - alias l='ls -GlT' alias ll='l -a' alias lt='l -at' @@ -22,14 +17,13 @@ if [ $(uname) == "Darwin" ]; then { export PATH=/opt/local/bin:/opt/local/sbin:$PATH #cmake export PATH="/Applications/CMake.app/Contents/bin":$PATH - } fi ## PATH -#prefix -export PATH=$PREFIX/bin:$PATH #rust export PATH="$HOME/.cargo/bin:$PATH" +#yml2 +#export PATH=$PATH:$HOME/src/yml2/ export LANG=en_US.UTF-8 export TERM=xterm diff --git a/bash_profile.d/java.sh b/bash_profile.d/java.sh index 2dc9946..cca0db6 100644 --- a/bash_profile.d/java.sh +++ b/bash_profile.d/java.sh @@ -1 +1,2 @@ export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_231.jdk/Contents/Home +export ANDROID_NDK=/Users/heck/Library/Android/sdk/ndk/21.0.6113669 diff --git a/bash_profile.d/pEp.sh b/bash_profile.d/pEp.sh index c416fc3..d02737d 100644 --- a/bash_profile.d/pEp.sh +++ b/bash_profile.d/pEp.sh @@ -1,5 +1,24 @@ #!/bin/bash +function pEpPrefix() { + export PREFIX_OLD=${PREFIX} + export PREFIX=${1} + + LIB_PATH_OLD=${PREFIX_OLD}/lib + LIB_PATH=${PREFIX}/lib + export DYLD_LIBRARY_PATH=$(echo ${DYLD_LIBRARY_PATH} | sed 's|${LIB_PATH_OLD}||') + export DYLD_LIBRARY_PATH=${LIB_PATH}:${DYLD_LIBRARY_PATH} + + BIN_PATH_OLD=${PREFIX_OLD}/bin + BIN_PATH=${PREFIX}/bin + export PATH=$(echo ${PATH} | sed 's|${BIN_PATH_OLD}||') + export PATH=${BIN_PATH}:${PATH} + + echo PREFIX=${PREFIX} + echo DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH} + echo PATH=${PATH} +} + # Delete symlinks in the pEpPythonAdapter (to allow "project search") function pEpPythonAdapterRmSymlinks() { for i in $(find . -type l | grep -i lib); do { rm -v $i; }; done @@ -111,3 +130,4 @@ function mount_pepsioux() { } alias test_pEpPythonAdapter='python3 -c "import pEp;"' +pEpPrefix /Users/heck/local-3x