- improved detection of runned ZABBIX applications (Eugene)

git-svn-id: svn://svn.zabbix.com/trunk@3824 97f52cf1-0a1b-0410-bd0e-c28be96e8082

1 files changed, 16 insertions, 4 deletions

diff --git a/do b/do
index e2aff3a7..1f516f48 100755
--- a/do
+++ b/do
@@ -13,13 +13,14 @@ copy="no"
 tgz="no"
 configure="no"
 domake="no"
-config_param="--prefix=`pwd`"
+doinstall="no"
+config_param=""
 dotest="no"
 cleanwarnings="no"
 docat="yes"
 help="no"
-noparam=0;
-def="--enable-agent --enable-server --with-mysql"
+noparam=0
+def="--enable-agent --enable-server --with-mysql --prefix=`echo $HOME`/local/zabbix"
 
 for cmd
 do
@@ -32,7 +33,10 @@ do
     conf )	configure="yes";	noparam=1;;
     config )	configure="yes";	noparam=1;;
     configure )	configure="yes";	noparam=1;;
+    mk )	domake="yes";		noparam=1;;
     make )	domake="yes";		noparam=1;;
+    inst )	doinstall="yes";	noparam=1;;
+    install )	doinstall="yes";	noparam=1;;
     test )	dotest="yes";		noparam=1;;
     tar )	tgz="yes";		noparam=1;;
     nocat )	docat="no";		noparam=1;;
@@ -61,6 +65,7 @@ then
 	echo "   [configure|config|conf]  - configure make files"
 	echo "   [make]                   - make applications"
 	echo "   [test]                   - test applications"
+	echo "   [inst|install]           - install applications"
 	echo "   [tar]                    - create ../zabbix.tar.gz of this folder"
 	echo
 	echo " Options:"
@@ -81,7 +86,7 @@ fi
 if [ "$copy" = "yes" ] || [ $premake = "yes" ] || 
   [ $configure = "yes" ] || [ $domake = "yes" ] || 
   [ $dotest = "yes" ] || [ $tgz = "yes" ] ||
-  [ "$win2nix" = "yes" ]
+  [ "$win2nix" = "yes" ] || [ $doinstall = "yes" ]
 then
   cleanwarnings="yes"
 fi
@@ -159,6 +164,13 @@ then
   ./src/zabbix_agent/zabbix_agentd -p >> WARNINGS
 fi
 
+if [ "$doinstall" = "yes" ] 
+then
+  echo "Instalation..."
+  echo "Instalation..." >> WARNINGS
+  make install 2>> WARNINGS 
+fi
+
 if [ "$tgz" = "yes" ] 
 then
   echo "Zipping..."