From: vsr Date: Thu, 14 Dec 2006 11:26:12 +0000 (+0000) Subject: modify qt source installation final step: replace ls by find (ls can be aliased to... X-Git-Tag: V_3_2_4~23 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=22f7103beefa7743e1cd2c0739589e9229bfae1c;p=tools%2Finstall.git modify qt source installation final step: replace ls by find (ls can be aliased to 'ls -F' that causes an error) --- diff --git a/config_files/qt-3.3.3.sh b/config_files/qt-3.3.3.sh index 3b944e4..213f593 100755 --- a/config_files/qt-3.3.3.sh +++ b/config_files/qt-3.3.3.sh @@ -122,7 +122,8 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install export INSTALL_ROOT=$INSTALL_ROOT_BACKUP -for b in `ls ${PRODUCT_WORK}/bin`; do +for b in `find bin -mindepth 1 -maxdepth 1 -name "*"`; do + b=`basename $b`; if [ ! -e ${PRODUCT_DIR}/bin/$b ] || [ -h ${PRODUCT_DIR}/bin/$b ]; then if [ -h ${PRODUCT_DIR}/bin/$b ]; then rm -f ${PRODUCT_DIR}/bin/$b diff --git a/config_files/qt-3.3.4.sh b/config_files/qt-3.3.4.sh index ac393fe..cf1e7cf 100755 --- a/config_files/qt-3.3.4.sh +++ b/config_files/qt-3.3.4.sh @@ -151,7 +151,8 @@ fi export INSTALL_ROOT=$INSTALL_ROOT_BACKUP -for b in `ls ${PRODUCT_WORK}/bin`; do +for b in `find bin -mindepth 1 -maxdepth 1 -name "*"`; do + b=`basename $b`; if [ ! -e ${PRODUCT_DIR}/bin/$b ] || [ -h ${PRODUCT_DIR}/bin/$b ]; then if [ -h ${PRODUCT_DIR}/bin/$b ]; then rm -f ${PRODUCT_DIR}/bin/$b