删除gawk依赖-ops-cv-AtomGit

已合并

删除gawk依赖 #785

删除gawk依赖 #785

已合并

zhaowenrui创建于 4月24日

共 8 个文件变更+7-39

	@@ -1759,4 +1759,4 @@ set -o pipefail
1759	if [ $# -eq 0 ]; then	1759	if [ $# -eq 0 ]; then
1760	usage	1760	usage
1761	fi	1761	fi
1762	-main "$@" \| gawk '{print strftime("[%Y-%m-%d %H:%M:%S]"), $0}'	1762	+main "$@" \| while IFS= read -r line; do echo "$(date '+[%Y-%m-%d %H:%M:%S]') $line"; done

	@@ -136,7 +136,6 @@ docker run --name cann_container --device /dev/davinci0 --device /dev/davinci_ma
136	- cmake >= 3.16.0	136	- cmake >= 3.16.0
137	- pigz（可选，安装后可提升打包速度，建议版本 >= 2.4）	137	- pigz（可选，安装后可提升打包速度，建议版本 >= 2.4）
138	- dos2unix	138	- dos2unix
139	- - gawk
140	- make	139	- make
141	- patch	140	- patch
142	- googletest（仅执行UT时依赖，建议版本 [release-1.11.0](https://github.com/google/googletest/releases/tag/release-1.11.0)）	141	- googletest（仅执行UT时依赖，建议版本 [release-1.11.0](https://github.com/google/googletest/releases/tag/release-1.11.0)）

	@@ -72,36 +72,6 @@ detect_os() {
72	fi	72	fi
73	}	73	}
74		74
75	-install_gawk() {
76	- echo -e "\n==== Checking Gawk ===="
77	-
78	- if command -v gawk &> /dev/null; then
79	- echo "Gawk has been installed"
80	- return
81	- fi
82	-
83	- echo "Installing Gawk..."
84	- case "$OS" in
85	- debian)
86	- run_command sudo $PKG_MANAGER update
87	- run_command sudo $PKG_MANAGER install -y gawk
88	- ;;
89	- rhel)
90	- run_command sudo $PKG_MANAGER install -y gawk
91	- ;;
92	- macos)
93	- run_command brew install gawk
94	- ;;
95	- esac
96	-
97	- if command -v gawk &> /dev/null; then
98	- echo "Gawk installed successfully"
99	- else
100	- echo "Gawk installation failed"
101	- exit 1
102	- fi
103	-}
104	-
105	install_python() {	75	install_python() {
106	# Python version >= 3.7.0	76	# Python version >= 3.7.0
107	echo -e "\n==== Checking Python ===="	77	echo -e "\n==== Checking Python ===="
	@@ -434,7 +404,6 @@ main() {
434	echo "===================================================="	404	echo "===================================================="
435		405
436	detect_os	406	detect_os
437	- install_gawk
438	install_python	407	install_python
439	install_gcc	408	install_gcc
440	install_cmake	409	install_cmake
	@@ -448,4 +417,4 @@ main() {
448	echo "===================================================="	417	echo "===================================================="
449	}	418	}
450		419
451	-main "$@"	420	+main "$@"

	@@ -41,4 +41,4 @@ main() {
41	exit 0	41	exit 0
42	}	42	}
43	set -o pipefail	43	set -o pipefail
44	-main "$@" \| gawk '{print strftime("[%Y-%m-%d %H:%M:%S]"), $0}'	44	+main "$@" \| while IFS= read -r line; do echo "$(date '+[%Y-%m-%d %H:%M:%S]') $line"; done

	@@ -70,4 +70,4 @@ main() {
70	fi	70	fi
71	}	71	}
72	set -o pipefail	72	set -o pipefail
73	-main "$@" \| gawk '{print strftime("[%Y-%m-%d %H:%M:%S]"), $0}'	73	+main "$@" \| while IFS= read -r line; do echo "$(date '+[%Y-%m-%d %H:%M:%S]') $line"; done

	@@ -78,4 +78,4 @@ main() {
78	${parer_cmd}	78	${parer_cmd}
79	}	79	}
80	set -o pipefail	80	set -o pipefail
81	-main "$@" \| gawk '{print strftime("[%Y-%m-%d %H:%M:%S]"), $0}'	81	+main "$@" \| while IFS= read -r line; do echo "$(date '+[%Y-%m-%d %H:%M:%S]') $line"; done

	@@ -58,4 +58,4 @@ main() {
58	${parer_cmd}	58	${parer_cmd}
59	}	59	}
60	set -o pipefail	60	set -o pipefail
61	-main "$@" \| gawk '{print strftime("[%Y-%m-%d %H:%M:%S]"), $0}'	61	+main "$@" \| while IFS= read -r line; do echo "$(date '+[%Y-%m-%d %H:%M:%S]') $line"; done

	@@ -159,4 +159,4 @@ main() {
159	exit 0	159	exit 0
160	}	160	}
161	set -o pipefail	161	set -o pipefail
162	-main "$@" \| gawk '{print strftime("[%Y-%m-%d %H:%M:%S]"), $0}'	162	+main "$@" \| while IFS= read -r line; do echo "$(date '+[%Y-%m-%d %H:%M:%S]') $line"; done