plantroon/acme.sh
1
0
Fork 0
mirror of https://github.com/plantroon/acme.sh.git synced 2024-12-22 13:11:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #574 from Neilpang/dev

Browse Source 
Dev
This commit is contained in:
neil 2017-02-03 20:22:16 +08:00 committed by GitHub
commit f2a6dc4dfd
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
acme.sh
View File

@ -1820,14 +1820,18 @@ _starttlsserver() {
_readlink() { _readlink() {
_rf="$1" _rf="$1"
if ! readlink -f "$_rf" 2>/dev/null; then if ! readlink -f "$_rf" 2>/dev/null; then
if _startswith "$_rf" "\./$PROJECT_ENTRY"; then if _startswith "$_rf" "/"; then
printf -- "%s" "$(pwd)/$PROJECT_ENTRY" echo "$_rf"
return 0 return 0
fi fi
readlink "$_rf" echo "$(pwd)/$_rf" | _conapath
fi fi
} }
_conapath() {
sed "s#/\./#/#g"
}
__initHome() { __initHome() {
if [ -z "$_SCRIPT_HOME" ]; then if [ -z "$_SCRIPT_HOME" ]; then
if _exists readlink && _exists dirname; then if _exists readlink && _exists dirname; then
@ -4666,7 +4670,7 @@ _process() {
HTTPS_INSECURE="1" HTTPS_INSECURE="1"
;; ;;
--ca-bundle) --ca-bundle)
_ca_bundle="$(readlink -f "$2")" _ca_bundle="$(_readlink -f "$2")"
CA_BUNDLE="$_ca_bundle" CA_BUNDLE="$_ca_bundle"
shift shift
;; ;;