Small correction

[tools/install.git] / config_files / common.sh

diff --git a/config_files/common.sh b/config_files/common.sh
index 6b0eaed6f0e15a7bcd52d219a57c91f43fef6d41..2f33ae8ed98297846ad5f3ca6fd2aba909689d59 100755 (executable)
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -208,6 +208,7 @@ EOF
 
 # 3. writing global functions to _salome.csh file
 cat >> ${install_work}/_$CSHRC <<EOF
+
 ###########################################################################
 # Aliases setenva and setenvp are used to append/prepend correspondingly 
 # one directory or a set of directories separated by semicolon symbol (':')
@@ -279,6 +280,11 @@ sed -e 's%export\([[:blank:]]*\)PATH=\$[{]\?PATH[}]\?:\(.*\)%exporta\1PATH \2%g'
 sed -e 's%export\([[:blank:]]*\)LD_LIBRARY_PATH=\$[{]\?LD_LIBRARY_PATH[}]\?:\(.*\)%exporta\1LD_LIBRARY_PATH \2%g' -e 's%export\([[:blank:]]*\)LD_LIBRARY_PATH=\(.*\):\$[{]\?LD_LIBRARY_PATH[}]\?%exportp\1LD_LIBRARY_PATH \2%g' ${INSTALL_WORK}/_tmp1 > ${INSTALL_WORK}/_tmp2 2>/dev/null
 sed -e 's%export\([[:blank:]]*\)PYTHONPATH=\$[{]\?PYTHONPATH[}]\?:\(.*\)%exporta\1PYTHONPATH \2%g' -e 's%export\([[:blank:]]*\)PYTHONPATH=\(.*\):\$[{]\?PYTHONPATH[}]\?%exportp\1PYTHONPATH \2%g' ${INSTALL_WORK}/_tmp2 > ${INSTALL_WORK}/_tmp1 2>/dev/null
 sed -e 's%export\([[:blank:]]*\)LD_RUN_PATH=\$[{]\?LD_RUN_PATH[}]\?:\(.*\)%exporta\1LD_RUN_PATH \2%g' -e 's%export\([[:blank:]]*\)LD_RUN_PATH=\(.*\):\$[{]\?LD_RUN_PATH[}]\?%exportp\1LD_RUN_PATH \2%g' ${INSTALL_WORK}/_tmp1 > ${INSTALL_WORK}/_tmp2
+
+# Setting "/usr/X11R6/lib" path in LD_LIBRARY_PATH for the libGL.so.1 file
+echo '# Setting /usr/X11R6/lib path in LD_LIBRARY_PATH for the libGL.so.1 file' >> ${INSTALL_WORK}/_tmp2
+echo 'export LD_LIBRARY_PATH=/usr/X11R6/lib:${LD_LIBRARY_PATH}' >> ${INSTALL_WORK}/_tmp2
+
 cat ${INSTALL_WORK}/_tmp2 >> ${install_work}/_$SHRC
 
 # 5. Create a salome.csh file from salome.sh by replacing export by setenv, etc.
@@ -304,26 +310,27 @@ if [ $# -eq 4 ] ; then
     fi
 fi
 sed -e 's%setenv ENV_FOR_LAUNCH 1%setenv ENV_FOR_LAUNCH 0%' ${install_work}/_$CSHRC > ${install_root}/env_build.csh
-# Setting "/usr/X11R6/lib" path in LD_LIBRARY_PATH for the libGL.so.1 file
-echo "setenv LD_LIBRARY_PATH /usr/X11R6/lib:${LD_LIBRARY_PATH}" >> ${install_root}/env_build.csh
-
 sed -e 's%export ENV_FOR_LAUNCH=1%export ENV_FOR_LAUNCH=0%' ${install_work}/_$SHRC  > ${install_root}/env_build.sh
-# Setting "/usr/X11R6/lib" path in LD_LIBRARY_PATH for the libGL.so.1 file
-echo "export LD_LIBRARY_PATH=/usr/X11R6/lib:${LD_LIBRARY_PATH}" >> ${install_root}/env_build.sh
 
 cp -f ${install_work}/_$CSHRC ${install_root}/env_products.csh
-# Setting "/usr/X11R6/lib" path in LD_LIBRARY_PATH for the libGL.so.1 file
-echo "setenv LD_LIBRARY_PATH /usr/X11R6/lib:${LD_LIBRARY_PATH}" >> ${install_root}/env_products.csh
-
 cp -f ${install_work}/_$SHRC  ${install_root}/env_products.sh
-# Setting "/usr/X11R6/lib" path in LD_LIBRARY_PATH for the libGL.so.1 file
-echo "export LD_LIBRARY_PATH=/usr/X11R6/lib:${LD_LIBRARY_PATH}" >> ${install_root}/env_products.sh
 
 rm -f ${install_work}/_$SHRC ${install_work}/_$CSHRC
 ### !!! copying build.csh script
 if [ -e ./build.csh ]; then
     cp -f ./build.csh ${install_root}
 fi
+### !!! copying release notes
+for p in `ls ../` ; do
+    export pdf=`echo ${p} | sed s/[.]/" "/g | awk '{print $2}'`
+    if [ "${pdf}" = "pdf" ]; then
+       export RN=$p
+       if [ ! -e ${install_root}/${RN} ]; then
+           cp -f ../${RN} ${install_root}
+       fi
+    fi
+done
+
 }
 
 #try use already existing product