From c832c9417b4ce026b1cbb7a38ca69d8fc7a9f357 Mon Sep 17 00:00:00 2001
From: YuQing <yyq01323329@alibaba-inc.com>
Date: Fri, 31 Mar 2023 15:32:50 +0800
Subject: [PATCH] tools/remediation-kits/run_Anolis_remediation_kit.sh &&
 tools/scanners/run_Anolis_scanners.sh: remove plateform checks.

Signed-off-by: YuQing <yyq01323329@alibaba-inc.com>
---
 .../run_Anolis_remediation_kit.sh             | 26 ++++++++-----------
 tools/scanners/run_Anolis_scanners.sh         | 13 ++++------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/tools/remediation-kits/run_Anolis_remediation_kit.sh b/tools/remediation-kits/run_Anolis_remediation_kit.sh
index 12a6c47..a3048e4 100755
--- a/tools/remediation-kits/run_Anolis_remediation_kit.sh
+++ b/tools/remediation-kits/run_Anolis_remediation_kit.sh
@@ -66,24 +66,20 @@ function main() {
 }
 
 # 验证操作系统是否符合加固要求（Anolis 8）
-systemVersion=false
-cat /etc/redhat-release | grep -Pq "^Anolis\s+OS\s+release\s+8.*" && systemVersion=true
+# systemVersion=false
+# cat /etc/redhat-release | grep -Pq "^Anolis\s+OS\s+release\s+8.*" && systemVersion=true
 
-if [[ $systemVersion == "true" ]] ; then
-    if [[ -z $1 ]] ; then # 没有参数直接执行默认加固
-        config=""
+if [[ -z $1 ]] ; then # 没有参数直接执行默认加固
+    config=""
+    main
+elif [[ $# -eq 2 && $1 == "-c" ]] ; then # -c参数 指定自定义config
+    if [[ -f $2 ]] ; then # 判断config文件是否存在
+        echo "configfile is: $2"
+        config=$2
         main
-    elif [[ $# -eq 2 && $1 == "-c" ]] ; then # -c参数 指定自定义config
-        if [[ -f $2 ]] ; then # 判断config文件是否存在
-            echo "configfile is: $2"
-            config=$2
-            main
-        else
-            echo "$2 is not the correct configuration file."
-        fi
     else
-        helpinfo
+        echo "$2 is not the correct configuration file."
     fi
 else
-    echo "Sorry, your operating system does not apply" # 系统不符合要求提示
+    helpinfo
 fi
\ No newline at end of file
diff --git a/tools/scanners/run_Anolis_scanners.sh b/tools/scanners/run_Anolis_scanners.sh
index 646e74a..9174950 100755
--- a/tools/scanners/run_Anolis_scanners.sh
+++ b/tools/scanners/run_Anolis_scanners.sh
@@ -128,13 +128,10 @@ function main() {
     [ -f $current_path/log/$logfile ] && echo "Log is saved in: $current_path/log/$logfile" # 展示日志文件名及路径
 }
 
-systemVersion=false
-cat /etc/redhat-release | grep -Pq "^Anolis\s+OS\s+release\s+8.*" && systemVersion=true # 判断系统版本是否符合执行要求
+# systemVersion=false
+# cat /etc/redhat-release | grep -Pq "^Anolis\s+OS\s+release\s+8.*" && systemVersion=true # 判断系统版本是否符合执行要求
 current_path="$(cd $(dirname $0);pwd)" # 获取绝对路径
 
-if [[ $systemVersion == "true" ]] ; then
-    option $@
-    [ ! -z $config ] && main
-else
-    echo "Sorry, your operating system does not apply" # 系统不符合要求提示
-fi
\ No newline at end of file
+
+option $@
+[ ! -z $config ] && main
\ No newline at end of file
-- 
Gitee