Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
f2a6dc4d
Commit
f2a6dc4d
authored
Feb 03, 2017
by
neil
Committed by
GitHub
Feb 03, 2017
Browse files
Merge pull request #574 from Neilpang/dev
Dev
parents
94965a41
67e3dd36
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
f2a6dc4d
...
...
@@ -1820,14 +1820,18 @@ _starttlsserver() {
_readlink() {
_rf="$1"
if ! readlink -f "$_rf" 2>/dev/null; then
if
_startswith
"
$_rf
"
"
\.
/
$PROJECT_ENTRY
"
;
then
printf
--
"%s"
"
$(
pwd
)
/
$PROJECT_ENTRY
"
if _startswith "$_rf" "
/
"; then
echo "$_rf
"
return 0
fi
readlink
"
$_rf
"
echo "$(pwd)/$_rf" | _conapath
fi
}
_conapath() {
sed "s#/\./#/#g"
}
__initHome() {
if [ -z "$_SCRIPT_HOME" ]; then
if _exists readlink && _exists dirname; then
...
...
@@ -4666,7 +4670,7 @@ _process() {
HTTPS_INSECURE="1"
;;
--ca-bundle)
_ca_bundle
=
"
$(
readlink
-f
"
$2
"
)
"
_ca_bundle="$(
_
readlink -f "$2")"
CA_BUNDLE="$_ca_bundle"
shift
;;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment