diff --git a/Config/Web/acme/manage.sh b/Config/Web/acme/manage.sh index 12c34d3..dd9eddf 100644 --- a/Config/Web/acme/manage.sh +++ b/Config/Web/acme/manage.sh @@ -12,7 +12,7 @@ case $pick in for i in "${HOME}/.acme.sh"/* ; do print_name=$(basename $i ) - if ! echo $print_name | grep _ecc ; then + if ! echo "$print_name" | grep -q "_ecc" ; then continue fi print_name=$(echo $print_name | sed "s/_ecc//g" ) @@ -20,7 +20,7 @@ case $pick in print_arr[$print_number]=$print_name echo "${print_number}.${print_name}" done - read -p "请选择要查看证书的详细信息" pick + read -p "请输入要查看证书详细信息的序号:" pick if [[ $pick =~ [1-${#print_arr[@]}] ]]; then bash "${HOME}/.acme.sh -info -d ${print_arr[$pick]}" else diff --git a/Config/Web/nginx/install.sh b/Config/Web/nginx/install.sh index 36dd9f6..3ca2c46 100644 --- a/Config/Web/nginx/install.sh +++ b/Config/Web/nginx/install.sh @@ -24,13 +24,11 @@ if [[ $pick == 2 ]]; then else echo "1.nginx(默认)" read -p "请选择:" pick - bash "$(dirname $0)/acme/apply.sh" "nginx" "${domain}" + bash "$(dirname $(dirname $0))/acme/apply.sh" "nginx" "${domain}" ssl_certificate="${HOME}/.acme.sh/${ssl_domain}_ecc/fullchain.cer" ssl_certificate_key="${HOME}/.acme.sh/${ssl_domain}_ecc/${ssl_domain}.key" fi - - declare name read -p "请输入配置文件名,默认为域名:" name if [[ -z $name ]]; then