]> SALOME platform Git repositories - tools/install.git/commitdiff
Salome HOME
fix a bug with 'test -n' option
authorvsr <vsr@opencascade.com>
Fri, 21 Oct 2005 13:46:51 +0000 (13:46 +0000)
committervsr <vsr@opencascade.com>
Fri, 21 Oct 2005 13:46:51 +0000 (13:46 +0000)
config_files/Python-2.3.4.sh
config_files/Python-2.3.5.sh
config_files/graphviz-1.9.sh
config_files/graphviz-2.2.1.sh
config_files/med-2.2.2.sh
config_files/sip-4.1.sh

index 23f68b08f4f1c535ac7152b529bb1c8195933dda..3d5b8b8ec6931ffb5a40ab190bc359ca0afe6cc2 100755 (executable)
@@ -6,7 +6,7 @@ if [ -z "$PYTHONHOME"  ]; then
    return 1
 fi
 isPython=`which python 2>/dev/null`
-if [ -n isPython ]; then
+if [ -n "$isPython" ]; then
   # version number is calculated as: <major>*10000+<minor>*100+<release>
   # e.g. for Python 2.3.4 it is equal to 20304
   ver=`python -V 2>&1`
index c4acec1a38b9dd5730a816e3f97dadcc06b1d4bb..549c44077e4b2e17c6534e093b2d92d699ed7f4e 100755 (executable)
@@ -6,7 +6,7 @@ if [ -z "$PYTHONHOME"  ]; then
    return 1
 fi
 isPython=`which python 2>/dev/null`
-if [ -n isPython ]; then
+if [ -n "$isPython" ]; then
   # version number is calculated as: <major>*10000+<minor>*100+<release>
   # for Python 2.3.5 it is equal to 20305
   ver=`python -V 2>&1`
index 27799ba6c3f7ea0f189bd6cde8ca8ed36077c607..4e74c4f194c8e6613690e9100c8ade08c44d9575 100755 (executable)
@@ -3,7 +3,7 @@
 check_version()
 {
 isdot=`which dot 2>/dev/null`
-if [ -n isdot ]; then
+if [ -n "$isdot" ]; then
   ver=`dot -V 2>&1 | awk '{print $3}'`
   if [ "$ver" == "1.9" ]; then
     return 0
index a3880fb69d6a2ec792a02dec237bd5dfca0f679b..e2302c70fd6982179f74627ab140c33da70b9ae9 100755 (executable)
@@ -3,7 +3,7 @@
 check_version()
 {
 isdot=`which dot 2>/dev/null`
-if [ -n isdot ]; then
+if [ -n "$isdot" ]; then
   ver=`dot -V 2>&1 | awk '{print $3}'`
   if [ "$ver" == "2.2.1" ]; then
     return 0
index 85cf5b736b54970a530ef237255a14cc34e62b43..3f5142e62569b7508b652fb352962a159ff32082 100755 (executable)
@@ -83,7 +83,7 @@ mv -f libmed.la.new libmed.la
 sed -e 's%\(.*\)\([[:space:]].*libhdf5.la\)\(.*\)%\1 -lhdf5\3%g' libmedC.la > libmedC.la.new
 mv -f libmedC.la.new libmedC.la
 tmp=""
-if [ -n ${HDF5HOME} ]; then
+if [ -n "${HDF5HOME}" ]; then
     tmp="-L${HDF5HOME}/lib"
 fi
 sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.4\.4/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmed.la > libmed.la.new
@@ -113,7 +113,7 @@ mv -f libmed.la.new libmed.la
 sed -e 's%\(.*\)\([[:space:]].*libhdf5.la\)\(.*\)%\1 -lhdf5\3%g' -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libmedC.la > libmedC.la.new
 mv -f libmedC.la.new libmedC.la
 tmp=""
-if [ -n ${HDF5HOME} ]; then
+if [ -n "${HDF5HOME}" ]; then
     tmp="-L${HDF5HOME}/lib"
 fi
 sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.4\.4/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmed.la > libmed.la.new
index 64c64ee29604f2452e2fd988a5d72300a076ad2b..1d5a0821ed550b50c49248fc9912aa3273ffdfc8 100755 (executable)
@@ -37,7 +37,7 @@ if [ -n "${sipdir}" ] ; then
     if [ -z "${sippython}" ] ; then
         sippython="`find_in_path sip.so /usr/lib/python${python_version}/site-packages`"
     fi
-    if [ -n ${sippython} ]; then
+    if [ -n "${sippython}" ]; then
         tmp="${sipdir} ${sipdir} \${PATH} ${PATH}";
         path=`sort_path ${tmp}`
         tmp="${sipdir} ${sipdir} \${LD_LIBRARY_PATH} ${LD_LIBRARY_PATH}";