Update for version 2.2.7

[tools/install.git] / config_files / HappyDoc-r2_1.sh

diff --git a/config_files/HappyDoc-r2_1.sh b/config_files/HappyDoc-r2_1.sh
index a7d18c221803e92fd24e2b4ab65422113c062372..f1181f992542e211cf8534a0acd3e0130b059f3b 100755 (executable)
--- a/config_files/HappyDoc-r2_1.sh
+++ b/config_files/HappyDoc-r2_1.sh
@@ -5,10 +5,13 @@ check_lib_version happydoc $PATH
 if [ "$?" -ne "0" ]; then
    return 1
 fi
-ver=`happydoc | grep "HappyDoc version 2.1"`  
-if [ -n "$ver" ]; then
-   #echo "The product ${PRODUCT} has been already installed on yours system"
-   return 0
+happydoc 2&> /dev/null
+if [ "$?" -eq "0" ]; then
+    ver=`happydoc | grep "HappyDoc version 2.1"`  
+    ver=`happydoc | grep "HappyDoc version 2.1" | sort -u | awk '{print $NF}'`
+    if [ "$ver" == "2.1" ]; then
+       return 0
+    fi
 fi
 return 1
 }
@@ -88,6 +91,9 @@ print_env
 
 install_binary()
 {
+make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" ${PRODUCT_TYPE}
+source ${INSTALL_WORK}/$SHRC
+
 check_jb tar xfz ${SOURCE_DIR}/HappyDoc-r2_1.tar.gz -C ${INSTALL_ROOT}
 
 print_env