Merge pull request #1083 from sofia-riese/patch-5

Continue to address the issue of function self-invocation

scripts/menus/9_upgrade.sh

@@ -718,14 +718,14 @@ done
 getdb() {
     dblink="${update_url}/"
     echo "-----------------------------------------------"
-	echo 正在连接服务器获取安装文件…………
+    echo "正在连接服务器获取安装文件…………"
     get_bin "$TMPDIR"/clashdb.tar.gz bin/dashboard/${db_type}.tar.gz
     if [ "$?" = "1" ]; then
         echo "-----------------------------------------------"
         echo -e "\033[31m文件下载失败！\033[0m"
         echo "-----------------------------------------------"
         error_down
-		setdb
+        return 1
     else
         echo -e "\033[33m下载成功，正在解压文件！\033[0m"
         mkdir -p $dbdir >/dev/null
@@ -748,7 +748,7 @@ getdb(){
     fi
     sleep 1
 }
-setdb(){
+
 dbdir() {
     if [ -f /www/clash/CNAME -o -f "$CRASHDIR"/ui/CNAME ]; then
         echo "-----------------------------------------------"
@@ -761,8 +761,8 @@ setdb(){
             [ -f "$CRASHDIR"/ui/CNAME ] && rm -rf "$CRASHDIR"/ui && dbdir="$CRASHDIR"/ui
             getdb
         else
-				setdb
             echo -e "\033[33m安装已取消！\033[0m"
+            return 1
         fi
     elif [ -w /www -a -n "$(pidof nginx)" ]; then
         echo "-----------------------------------------------"
@@ -773,19 +773,26 @@ setdb(){
         echo "-----------------------------------------------"
         echo " 0 返回上级菜单"
         read -p "请输入对应数字 > " num
-
-			if [ "$num" = '1' ]; then
+        case "$num" in
+        "" | 0)
+            return 0
+            ;;
+        1)
             dbdir="$CRASHDIR"/ui
             hostdir=": $db_port/ui"
             getdb
-			elif [ "$num" = '2' ]; then
+            ;;
+        2)
             dbdir=/www/clash
             hostdir='/clash'
             getdb
-			else
-				setdb
-				echo -e "\033[33m安装已取消！\033[0m"
-			fi
+            ;;
+        *)
+            errornum
+            sleep 1
+            return 1
+            ;;
+        esac
     else
         dbdir="$CRASHDIR"/ui
         hostdir=":$db_port/ui"
@@ -793,6 +800,8 @@ setdb(){
     fi
 }
 
+setdb() {
+    while true; do
         echo "-----------------------------------------------"
         echo -e "\033[36m安装本地版dashboard管理面板\033[0m"
         echo -e "\033[32m打开管理面板的速度更快且更稳定\033[0m"
@@ -810,9 +819,10 @@ setdb(){
         echo -e " 9 卸载\033[33m本地面板\033[0m"
         echo " 0 返回上级菜单"
         read -p "请输入对应数字 > " num
-
         case "$num" in
-	0) ;;
+        "" | 0)
+            break
+            ;;
         1)
             db_type=zashboard
             setconfig external_ui_url "https://github.com/Zephyruso/zashboard/releases/latest/download/dist-cdn-fonts.zip"
@@ -852,8 +862,11 @@ setdb(){
             ;;
         *)
             errornum
+            sleep 1
+            break
             ;;
         esac
+    done
 }
 
 #根证书