diff options
| author | Michele Mocciola | 2016-12-11 22:48:25 +0100 |
|---|---|---|
| committer | Michele Mocciola | 2016-12-11 22:48:25 +0100 |
| commit | 68dfd63dfa3171bb5593201555ce343c9a116fdd (patch) | |
| tree | 4bf4a7d062a99602a0fa0c971e28392fe7db46fc | |
| parent | c277f575b32f05b099eb6c4e169e463119d42b43 (diff) | |
| download | aur-68dfd63dfa3171bb5593201555ce343c9a116fdd.tar.gz | |
Little change in salome-kernel.sh
| -rw-r--r-- | salome-kernel.sh | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/salome-kernel.sh b/salome-kernel.sh index 4397a6042bdb..2a02afa874e8 100644 --- a/salome-kernel.sh +++ b/salome-kernel.sh @@ -2,25 +2,34 @@ export KERNEL_ROOT_DIR=/opt/salome # local vars -_pythonver=2.7 +_kernel_pythonver=2.7 _kernel_path=$KERNEL_ROOT_DIR/bin/salome -_kernel_pythonpath=$KERNEL_ROOT_DIR/lib/python${_pythonver}/site-packages/salome +_kernel_pythonpath=$KERNEL_ROOT_DIR/lib/python${_kernel_pythonver}/site-packages/salome:$_kernel_path _kernel_librarypath=$KERNEL_ROOT_DIR/lib/salome -# PYTHONPATH -if [[ $PYTHONPATH != *${_kernel_pythonpath}* ]]; then - export PYTHONPATH=${_kernel_pythonpath}:$PYTHONPATH -fi -if [[ $PYTHONPATH != *${_kernel_path}* ]]; then - export PYTHONPATH=${_kernel_path}:$PYTHONPATH +# PATH +if [[ $PATH != ${_kernel_path} && $PATH != *:${_kernel_path} && $PATH != ${_kernel_path}:* && $PATH != *:${_kernel_path}:* ]]; then + if [[ -z "$PATH" ]]; then + export PATH=${_kernel_path} + else + export PATH=${_kernel_path}:$PATH + fi fi # LD_LIBRARY_PATH -if [[ $LD_LIBRARY_PATH != *${_kernel_librarypath}* ]]; then - export LD_LIBRARY_PATH=${_kernel_librarypath}:$LD_LIBRARY_PATH +if [[ $LD_LIBRARY_PATH != ${_kernel_librarypath} && $LD_LIBRARY_PATH != *:${_kernel_librarypath} && $LD_LIBRARY_PATH != ${_kernel_librarypath}:* && $LD_LIBRARY_PATH != *:${_kernel_librarypath}:* ]]; then + if [[ -z "$LD_LIBRARY_PATH" ]]; then + export LD_LIBRARY_PATH=${_kernel_librarypath} + else + export LD_LIBRARY_PATH=${_kernel_librarypath}:$LD_LIBRARY_PATH + fi fi -# PATH -if [[ $PATH != *${_kernel_path}* ]]; then - export PATH=${_kernel_path}:$PATH +# PYTHONPATH +if [[ $PYTHONPATH != ${_kernel_pythonpath} && $PYTHONPATH != *:${_kernel_pythonpath} && $PYTHONPATH != ${_kernel_pythonpath}:* && $PYTHONPATH != *:${_kernel_pythonpath}:* ]]; then + if [[ -z "$PYTHONPATH" ]]; then + export PYTHONPATH=${_kernel_pythonpath} + else + export PYTHONPATH=${_kernel_pythonpath}:$PYTHONPATH + fi fi |