fix api fail and test run

install.sh

@@ -69,7 +69,7 @@ is_log_dir=/var/log/$is_core
 is_sh_bin=/usr/local/bin/$is_core
 is_sh_dir=$is_core_dir/sh
 is_sh_repo=$author/$is_core
-is_pkg="wget unzip jq qrencode"
+is_pkg="wget unzip jq"
 is_config_json=$is_core_dir/config.json
 tmp_var_lists=(
     tmpcore

src/core.sh

@@ -203,7 +203,7 @@ is_port_used() {
     fi
     is_cant_test_port=1
     msg "$is_warn 无法检测端口是否可用."
-    msg "请执行: $(_yellow "${cmd}update -y; ${cmd}install net-tools -y") 来修复此问题."
+    msg "请执行: $(_yellow "${cmd} update -y; ${cmd} install net-tools -y") 来修复此问题."
 }
 
 # ask input a string or pick a option for list.
@@ -828,6 +828,7 @@ api() {
     [[ ! $1 ]] && err "无法识别 API 的参数."
     [[ $is_core_stop ]] && {
         warn "$is_core_name 当前处于停止状态."
+        is_api_fail=1
         return
     }
     case $1 in
@@ -1244,7 +1245,7 @@ get() {
         dokodemo-door*)
             is_protocol=dokodemo-door
             net=door
-            json_str='settings:{port:'\"$door_port\"',address:'\"$door_addr\"',network:"tcp,udp"}'
+            json_str='settings:{port:'"$door_port"',address:'\"$door_addr\"',network:"tcp,udp"}'
             ;;
         *http*)
             is_protocol=http
@@ -1393,7 +1394,7 @@ get() {
             return
         }
         is_no_manage_msg=1
-        if [[ $is_core_stop ]]; then
+        if [[ ! $(pgrep -f $is_core_bin) ]]; then
             _yellow "\n测试运行 $is_core_name ..\n"
             manage start &>/dev/null
             if [[ $is_run_fail == $is_core ]]; then
@@ -1406,7 +1407,7 @@ get() {
             _green "\n$is_core_name 正在运行, 跳过测试\n"
         fi
         if [[ $is_caddy ]]; then
-            if [[ $is_caddy_stop ]]; then
+            if [[ ! $(pgrep -f $is_caddy_bin) ]]; then
                 _yellow "\n测试运行 Caddy ..\n"
                 manage start caddy &>/dev/null
                 if [[ $is_run_fail == 'caddy' ]]; then
@@ -1553,7 +1554,11 @@ url_qr() {
             link="https://233boy.github.io/tools/qr.html#${is_url}"
             msg "\n------------- $is_config_name & QR code 二维码 -------------"
             msg
-            qrencode -t ANSI "${is_url}"
+            if [[ $(type -P qrencode) ]]; then
+                qrencode -t ANSI "${is_url}"
+            else
+                msg "请安装 qrencode: $(_green "$cmd update -y; $cmd install qrencode -y")"
+            fi
             msg
             msg "如果无法正常显示或识别, 请使用下面的链接来生成二维码:"
             msg "\n\e[4;${is_color}m${link}\e[0m\n"

src/help.sh

@@ -79,9 +79,9 @@ about() {
     ####### 要点13脸吗只会改我链接的小人 #######
     unset c n m s b
     msg
-    msg "Blog: $(msg_ul https://233boy.com)"
-    msg "Chat: $(msg_ul https://t.me/tg233boy)"
-    msg "Chanel: $(msg_ul https://t.me/tg2333)"
+    msg "网站: $(msg_ul https://233boy.com)"
+    msg "频道: $(msg_ul https://t.me/tg2333)"
+    msg "群组: $(msg_ul https://t.me/tg233boy)"
     msg "Github: $(msg_ul https://github.com/${is_sh_repo})"
     msg "Twitter: $(msg_ul https://twitter.com/ai233boy)"
     msg "$is_core_name site: $(msg_ul https://www.v2fly.org)"

v2ray.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
 args=$@
-is_sh_ver=v4.05
+is_sh_ver=v4.07
 
 . /etc/v2ray/sh/src/init.sh