From 488cb36e66fa22bfb8bad82bbe5d3b61092f351c Mon Sep 17 00:00:00 2001
From: Olia Lisa <kannar7788@gmail.com>
Date: Sun, 9 Feb 2025 15:07:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=20Bash=20=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=E6=A3=80=E6=9F=A5=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/utils/base.sh |  8 ++------
 install.sh        | 15 +++++----------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/bin/utils/base.sh b/bin/utils/base.sh
index 2baa3a5..3ffb130 100644
--- a/bin/utils/base.sh
+++ b/bin/utils/base.sh
@@ -43,12 +43,8 @@ check_jq(){
 
 # 检查 Bash 是否已安装
 check_bash_installed() {
-  if command -v bash &> /dev/null; then
-    echo "Bash 已安装"
-    return 0  # 返回 0 表示 Bash 已安装
-  else
-    echo "Bash 未安装"
+  if ! command -v bash &> /dev/null; then
+    echo "错误: Bash 未安装！"
     return 1  # 返回 1 表示 Bash 未安装
   fi
 }
-
diff --git a/install.sh b/install.sh
index 3279537..96b8a64 100644
--- a/install.sh
+++ b/install.sh
@@ -1,15 +1,10 @@
 #!/bin/bash
 
-# 检查 Bash 是否已安装
-check_bash_installed() {
-  if command -v bash &> /dev/null; then
-    echo "Bash 已安装"
-    return 0  # 返回 0 表示 Bash 已安装
-  else
-    echo "Bash 未安装"
-    return 1  # 返回 1 表示 Bash 未安装
-  fi
-}
+script_dir="$(cd "$(dirname "$0")"; pwd)/bin" # 脚本所在目录
+source "${script_dir}/utils/base.sh"
+
+# 检查bash环境是否安装
+check_bash_installed
 
 # 显示菜单
 echo "请选择一个操作:"