From: vsr <vsr@opencascade.com>
Date: Mon, 26 May 2014 10:42:37 +0000 (+0400)
Subject: Process PV_PLUGIN_PATH envvar properly in the generated context file
X-Git-Tag: V7_4_0~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b06f2e65e80a76bce186b57eaa22f39c5022d832;p=tools%2Finstall.git

Process PV_PLUGIN_PATH envvar properly in the generated context file
---

diff --git a/config_files/common.sh b/config_files/common.sh
index f33e2aa..655b3dd 100755
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -385,10 +385,11 @@ cat ${INSTALL_WORK}/_tmp1 >> ${install_work}/_${CSHRC} 2>/dev/null
 rm -f ${INSTALL_WORK}/_tmp1 ${INSTALL_WORK}/_tmp2
 
 # 7. Create a salome.cfg file from salome.sh
-cat ${install_work}/${SHRC} | grep -v -e "^## " | grep -v "PV_PLUGIN_PATH" | awk 'BEGIN {v=1} /if / {v=0;} /fi/ {v=1;} {if (match($0, "KERNEL")) exit 0; else if(v==1 && match($0, "^ *fi *$")==0) print $0;}' >> ${install_work}/${CFGRC}
+cat ${install_work}/${SHRC} | grep -v -e "^## " | awk 'BEGIN {v=1} /if / {v=0;} /fi/ {v=1;} {if (match($0, "KERNEL")) exit 0; else if(v==1 && match($0, "^ *fi *$")==0) print $0;}' >> ${install_work}/${CFGRC}
 sed -i "s%export PATH=\(.*\):\${\?PATH}\?%ADD_TO_PATH: \1%g" ${install_work}/${CFGRC}
 sed -i "s%export LD_LIBRARY_PATH=\(.*\):\${\?LD_LIBRARY_PATH}\?%ADD_TO_LD_LIBRARY_PATH: \1%g" ${install_work}/${CFGRC}
 sed -i "s%export PYTHONPATH=\(.*\):\${\?PYTHONPATH}\?%ADD_TO_PYTHONPATH: \1%g" ${install_work}/${CFGRC}
+sed -i "s%export PV_PLUGIN_PATH=\(.*\)%ADD_TO_PV_PLUGIN_PATH: \1%g" ${install_work}/${CFGRC}
 sed -i "s%export %%g" ${install_work}/${CFGRC}
 sed -i "s%INST_ROOT%ROOT_SALOME%g" ${install_work}/${CFGRC}
 sed -i "s%\${\?\([A-Za-z0-9_]\+\)}\?%\%(\1)s%g" ${install_work}/${CFGRC}