fix a bug with 'test -n' option

diff --git a/config_files/Python-2.2.1.sh b/config_files/Python-2.2.1.sh
index 138125e56a9b378e46e745cf083bc36d80dc0973..2ddc754f8fb4cd2d3fa6c4279659cd12dbb97e6d 100755 (executable)
--- a/config_files/Python-2.2.1.sh
+++ b/config_files/Python-2.2.1.sh
@@ -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.2.1 it is equal to 20201
   ver=`python -V 2>&1`

diff --git a/config_files/Python-2.3.4.sh b/config_files/Python-2.3.4.sh
index 23f68b08f4f1c535ac7152b529bb1c8195933dda..3d5b8b8ec6931ffb5a40ab190bc359ca0afe6cc2 100755 (executable)
--- a/config_files/Python-2.3.4.sh
+++ b/config_files/Python-2.3.4.sh
@@ -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`

diff --git a/config_files/graphviz-1.9.sh b/config_files/graphviz-1.9.sh
index b047817e79375857cd2897f6f34a2c1bec26dc3e..b28c4bcfc1da9da03db109c7622d8de6403e8022 100755 (executable)
--- a/config_files/graphviz-1.9.sh
+++ b/config_files/graphviz-1.9.sh
@@ -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

diff --git a/config_files/graphviz-2.2.1.sh b/config_files/graphviz-2.2.1.sh
index a3880fb69d6a2ec792a02dec237bd5dfca0f679b..e2302c70fd6982179f74627ab140c33da70b9ae9 100755 (executable)
--- a/config_files/graphviz-2.2.1.sh
+++ b/config_files/graphviz-2.2.1.sh
@@ -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

diff --git a/config_files/med-2.1.6.sh b/config_files/med-2.1.6.sh
index b6be8068906e27c45bcd64c43d28adb781894fa2..df102813b6653eaa5012c1c4a8ffa98b998327bd 100755 (executable)
--- a/config_files/med-2.1.6.sh
+++ b/config_files/med-2.1.6.sh
@@ -78,7 +78,7 @@ rm -fr ${PRODUCT_WORK}
 ### modify libmed.la libmedC.la files to correct direct path to hdf5 library
 cd ${PRODUCT_DIR}/lib
 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
@@ -101,7 +101,7 @@ cd ${PRODUCT_DIR}/lib
 sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libmed.la > libmed.la.new
 mv -f libmed.la.new libmed.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

diff --git a/config_files/med-2.2.2.sh b/config_files/med-2.2.2.sh
index 85cf5b736b54970a530ef237255a14cc34e62b43..3f5142e62569b7508b652fb352962a159ff32082 100755 (executable)
--- a/config_files/med-2.2.2.sh
+++ b/config_files/med-2.2.2.sh
@@ -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

diff --git a/config_files/sip-3.3.2.sh b/config_files/sip-3.3.2.sh
index d37a97eca30ecbdead71bd2806efcb67c6048180..181d82022d138f62a4e00fae43c8e8766b9c4793 100755 (executable)
--- a/config_files/sip-3.3.2.sh
+++ b/config_files/sip-3.3.2.sh
@@ -37,7 +37,7 @@ if [ -n "${sipdir}" ] ; then
     if [ -z "${sippython}" ] ; then
        sippython="`find_in_path libsip.so.9.1.0 /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}";  

diff --git a/config_files/sip-4.1.sh b/config_files/sip-4.1.sh
index 64c64ee29604f2452e2fd988a5d72300a076ad2b..1d5a0821ed550b50c49248fc9912aa3273ffdfc8 100755 (executable)
--- a/config_files/sip-4.1.sh
+++ b/config_files/sip-4.1.sh
@@ -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}";