Merge pull request #1086 from sofia-riese/patch-1

Keep addressing function self-invocation

scripts/menus/9_upgrade.sh

@@ -490,7 +490,7 @@ setcore() {
 getgeo(){ #下载Geo文件
 	#生成链接
 	echo "-----------------------------------------------"
-	echo 正在从服务器获取数据库文件…………
+	echo "正在从服务器获取数据库文件…………"
 	get_bin "$TMPDIR"/${geoname} bin/geodata/$geotype
 	if [ "$?" = "1" ];then
 		echo "-----------------------------------------------"
@@ -515,6 +515,7 @@ getgeo(){ #下载Geo文件
 	fi
 	sleep 1
 }
+
 getcustgeo(){
 	echo "-----------------------------------------------"
 	echo "正在获取数据库文件…………"
@@ -534,7 +535,9 @@ getcustgeo(){
 	fi
 	sleep 1
 }
+
 checkcustgeo() {
+    while true; do
         [ "$api_tag" = "latest" ] && api_url=latest || api_url="tags/$api_tag"
         [ ! -s "$TMPDIR"/geo.list ] && {
             echo -e "\033[32m正在查找可更新的数据库文件！\033[0m"
@@ -551,7 +554,8 @@ checkcustgeo(){
             echo "-----------------------------------------------"
             read -p "请输入对应数字 > " num
             case "$num" in
-		0)
+            "" | 0)
+                break
                 ;;
             [1-99])
                 if [ "$num" -le "$(wc -l <"$TMPDIR"/geo.list)" ]; then
@@ -561,19 +565,23 @@ checkcustgeo(){
                     [ -n "$(echo $geotype | grep -oiE '.*(.srs|.mrs)')" ] && geoname=$geotype
                     custgeolink=https://github.com/${project}/releases/download/${release_tag}/${geotype}
                     getcustgeo
-				checkcustgeo
                 else
                     errornum
+                    sleep 1
+                    break
                 fi
                 ;;
             *)
                 errornum
+                sleep 1
+                beak
                 ;;
             esac
         else
             echo -e "\033[31m查找失败，请尽量在服务启动后再使用本功能！\033[0m"
             sleep 1
         fi
+    done
 }
 
 # 下载自定义数据库文件