Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
bf8867cc63 | ||
![]() |
b09b8b5c51 |
@@ -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
|
||||
|
@@ -1152,7 +1152,7 @@ get() {
|
||||
is_file_str=$2
|
||||
[[ ! $is_file_str ]] && is_file_str='.json$'
|
||||
# is_all_json=("$(ls $is_conf_dir | egrep $is_file_str)")
|
||||
readarray -t is_all_json <<<$(ls $is_conf_dir | egrep -i "$is_file_str" | sed '/dynamic-port-.*-link/d' | head -233) # limit max 233 lines for show.
|
||||
readarray -t is_all_json <<<"$(ls $is_conf_dir | egrep -i "$is_file_str" | sed '/dynamic-port-.*-link/d' | head -233)" # limit max 233 lines for show.
|
||||
[[ ! $is_all_json ]] && err "无法找到相关的配置文件: $2"
|
||||
[[ ${#is_all_json[@]} -eq 1 ]] && is_config_file=$is_all_json && is_auto_get_config=1
|
||||
[[ ! $is_config_file ]] && {
|
||||
@@ -1553,7 +1553,11 @@ url_qr() {
|
||||
link="https://233boy.github.io/tools/qr.html#${is_url}"
|
||||
msg "\n------------- $is_config_name & QR code 二维码 -------------"
|
||||
msg
|
||||
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"
|
||||
|
Reference in New Issue
Block a user