From fd37d68a05683a085413c20f1e6566fefa6c7102 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Mon, 20 Nov 2023 16:36:37 +0800
Subject: [PATCH] fix: change to 2.2311.8

---
 captrace/makefile       |  2 +-
 crontask/makefile       |  2 +-
 data2html/makefile      |  2 +-
 makefile                |  2 +-
 mkpkg.sh                |  2 +-
 restagent/makefile      |  2 +-
 sshsvc/makefile         |  2 +-
 tools/misc/insdeppkg.sh | 30 ++++++++++++++++--------------
 8 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/captrace/makefile b/captrace/makefile
index 2721e3f8..5e2610c2 100644
--- a/captrace/makefile
+++ b/captrace/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2311.7
+VERSION = 2.2311.8
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build
diff --git a/crontask/makefile b/crontask/makefile
index 4ea05721..961ccfe0 100644
--- a/crontask/makefile
+++ b/crontask/makefile
@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project
 
 PROJECT = OMC
-VERSION = 2.2311.7
+VERSION = 2.2311.8
 LIBDIR = ems.agt/lib
 BINNAME = crontask
 
diff --git a/data2html/makefile b/data2html/makefile
index 2a97bf9e..0b987b9a 100644
--- a/data2html/makefile
+++ b/data2html/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2311.7
+VERSION = 2.2311.8
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)
diff --git a/makefile b/makefile
index b89be52f..1a406b33 100644
--- a/makefile
+++ b/makefile
@@ -3,7 +3,7 @@
 ProjectL = omc
 ProjectU = OMC
 PROJECT = $(ProjectL)
-VERSION = 2.2311.7
+VERSION = 2.2311.8
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)
diff --git a/mkpkg.sh b/mkpkg.sh
index 23f0b6f4..7f0cb279 100644
--- a/mkpkg.sh
+++ b/mkpkg.sh
@@ -2,7 +2,7 @@
 
 ProcList="restagent crontask sshsvc captrace data2html"
 ProjectL=omc
-VERSION=2.2311.7
+VERSION=2.2311.8
 RelDate=`date +%Y%m%d`
 Release=$RelDate
 RelVer=$VERSION-$RelDate
diff --git a/restagent/makefile b/restagent/makefile
index c59a48df..542a0bb7 100644
--- a/restagent/makefile
+++ b/restagent/makefile
@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2311.7
+VERSION = 2.2311.8
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build
diff --git a/sshsvc/makefile b/sshsvc/makefile
index 66c45369..9c12cbfd 100644
--- a/sshsvc/makefile
+++ b/sshsvc/makefile
@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project
 
 PROJECT = OMC
-VERSION = 2.2311.7
+VERSION = 2.2311.8
 LIBDIR = ems.agt/lib
 BINNAME = sshsvc
 
diff --git a/tools/misc/insdeppkg.sh b/tools/misc/insdeppkg.sh
index 087d0de0..079e6534 100644
--- a/tools/misc/insdeppkg.sh
+++ b/tools/misc/insdeppkg.sh
@@ -1,19 +1,21 @@
 #!/bin/bash
 
-DepPkgDir=./omc-dep-pkg
-
-if [ $1 != "" ]; then
-    DepPkgDir=$1
+DepPkgDir=/tmp/omc-dep-pkg
+lines=22 #这个值是指这个脚本的行数加1，指向程序所在开始行
+tail +$lines $0 >/tmp/omc-dep-pkg.tar.gz # 利用tail命令把脚本指定行出到文件，$0表示脚本本身名称，$0是环境变量，这个命令用来把从$lines开始的内容写入一个/tmp目录的tar.gz文件里。
+echo -n "Decompressing omc depend package ..."
+echo "done"
+tar xvfz /tmp/omc-dep-pkg.tar.gz -C /tmp 1>/dev/null
+if [ ! -e ${DepPkgDir} ]; then
+        echo "${DepPkgDir}: Not such file or directory"
+        exit 1
 fi
-if [ -e ${DepPkgDir} ]; then
-	echo "${DepPkgDir}: Not such file or directory"
-	exit 1
-fi
-echo "Install omc depend package"
-for pkgdir in ${DepPkgDir}/*; do 
-	echo "Installing ${pkgdir} depend package ..."
-	cd ${pkgdir};
-	dpkg -i --ignore-depends= *.deb; 
+echo -n "Installing omc depend package ..."
+for pkgdir in ${DepPkgDir}/*; do
+        #echo "Installing ${pkgdir} depend package ..."
+        cd ${pkgdir};
+        dpkg -i --ignore-depends *.deb 1>/tmp/${pkgdir}.log 2>&1;
 done
-
+echo "done"
+rm -rf /tmp/omc-dep-pkg*
 exit 0
\ No newline at end of file