From 2b10e8a9b78bf71fd439345fc61b248a7fd0f279 Mon Sep 17 00:00:00 2001
From: jiajingbin <jiajaybin@126.com>
Date: Sat, 11 Jan 2025 16:06:49 +0800
Subject: [PATCH] feat: add trivy

---
 packaging/setup_env.sh | 38 ++++++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/packaging/setup_env.sh b/packaging/setup_env.sh
index 2cf1e9e952..9a624bfa9e 100644
--- a/packaging/setup_env.sh
+++ b/packaging/setup_env.sh
@@ -317,6 +317,17 @@ add_config_if_not_exist() {
     grep -qF -- "$config" "$file" || echo "$config" >> "$file"
 }
 
+# Function to check if a tool is installed
+check_installed() {
+    local command_name="$1"
+    if command -v "$command_name" >/dev/null 2>&1; then
+        echo "$command_name is already installed. Skipping installation."
+        return 0
+    else
+        echo "$command_name is not installed."
+        return 1
+    fi
+}
 # General error handling function
 check_status() {
     local message_on_failure="$1"
@@ -585,9 +596,12 @@ centos_skip_check() {
 # Deploy cmake
 deploy_cmake() {
     # Check if cmake is installed
-    if command -v cmake >/dev/null 2>&1; then
-        echo "Cmake is already installed. Skipping installation."
-        cmake --version
+    # if command -v cmake >/dev/null 2>&1; then
+    #     echo "Cmake is already installed. Skipping installation."
+    #     cmake --version
+    #     return
+    # fi
+    if check_installed "cmake"; then
         return
     fi
     install_package "cmake3"
@@ -1059,11 +1073,13 @@ deploy_go() {
     GOPATH_DIR="/root/go"
 
     # Check if Go is installed
-    if command -v go >/dev/null 2>&1; then
-        echo "Go is already installed. Skipping installation."
+    # if command -v go >/dev/null 2>&1; then
+    #     echo "Go is already installed. Skipping installation."
+    #     return
+    # fi
+    if check_installed "gp"; then
         return
     fi
-
     # Fetch the latest version number of Go
     GO_LATEST_DATA=$(curl --retry 10 --retry-delay 5 --retry-max-time 120 -s https://golang.google.cn/VERSION?m=text)
     GO_LATEST_VERSION=$(echo "$GO_LATEST_DATA" | grep -oP 'go[0-9]+\.[0-9]+\.[0-9]+')
@@ -1734,6 +1750,16 @@ deploy_docker_compose() {
 
 # Instal trivy
 install_trivy() {
+    echo -e "${YELLOW}Installing Trivy...${NO_COLOR}"
+    # Check if Trivy is already installed
+    # if command -v trivy >/dev/null 2>&1; then
+    #     echo "Trivy is already installed. Skipping installation."
+    #     trivy --version
+    #     return
+    # fi
+    if check_installed "trivy"; then
+        return
+    fi
     # Install jq
     install_package jq
     # Get latest version