Skip to content

Commit bf8867c

Browse files
committed
remove qrencode install
1 parent b09b8b5 commit bf8867c

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ is_log_dir=/var/log/$is_core
6969
is_sh_bin=/usr/local/bin/$is_core
7070
is_sh_dir=$is_core_dir/sh
7171
is_sh_repo=$author/$is_core
72-
is_pkg="wget unzip jq qrencode"
72+
is_pkg="wget unzip jq"
7373
is_config_json=$is_core_dir/config.json
7474
tmp_var_lists=(
7575
tmpcore

src/core.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ is_port_used() {
203203
fi
204204
is_cant_test_port=1
205205
msg "$is_warn 无法检测端口是否可用."
206-
msg "请执行: $(_yellow "${cmd}update -y; ${cmd}install net-tools -y") 来修复此问题."
206+
msg "请执行: $(_yellow "${cmd} update -y; ${cmd} install net-tools -y") 来修复此问题."
207207
}
208208

209209
# ask input a string or pick a option for list.
@@ -1553,7 +1553,11 @@ url_qr() {
15531553
link="https://233boy.github.io/tools/qr.html#${is_url}"
15541554
msg "\n------------- $is_config_name & QR code 二维码 -------------"
15551555
msg
1556-
qrencode -t ANSI "${is_url}"
1556+
if [[ $(type -P qrencode) ]]; then
1557+
qrencode -t ANSI "${is_url}"
1558+
else
1559+
msg "请安装 qrencode: $(_green "$cmd update -y; $cmd install qrencode -y")"
1560+
fi
15571561
msg
15581562
msg "如果无法正常显示或识别, 请使用下面的链接来生成二维码:"
15591563
msg "\n\e[4;${is_color}m${link}\e[0m\n"

v2ray.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

33
args=$@
4-
is_sh_ver=v4.05
4+
is_sh_ver=v4.06
55

66
. /etc/v2ray/sh/src/init.sh

0 commit comments

Comments
 (0)