Merge pull request #243 from t413/master

Support for shells without 'stat' (busybox ash)
This commit is contained in:
neil 2016-07-26 13:18:41 +08:00 committed by GitHub
commit 7a60c14b31
2 changed files with 9 additions and 3 deletions

View File

@ -32,6 +32,7 @@ Wiki: https://github.com/Neilpang/acme.sh/wiki
|14|-----| Cloud Linux https://github.com/Neilpang/le/issues/111 |14|-----| Cloud Linux https://github.com/Neilpang/le/issues/111
|15|[![](https://cdn.rawgit.com/Neilpang/acmetest/master/status/openbsd.svg)](https://github.com/Neilpang/letest#here-are-the-latest-status)|OpenBSD |15|[![](https://cdn.rawgit.com/Neilpang/acmetest/master/status/openbsd.svg)](https://github.com/Neilpang/letest#here-are-the-latest-status)|OpenBSD
|16|[![](https://cdn.rawgit.com/Neilpang/acmetest/master/status/mageia.svg)](https://github.com/Neilpang/letest#here-are-the-latest-status)|Mageia |16|[![](https://cdn.rawgit.com/Neilpang/acmetest/master/status/mageia.svg)](https://github.com/Neilpang/letest#here-are-the-latest-status)|Mageia
|17|-----| OpenWRT: Tested and working. See [wiki page](https://github.com/Neilpang/acme.sh/wiki/How-to-run-on-OpenWRT)
For all build statuses, check our [daily build project](https://github.com/Neilpang/acmetest): For all build statuses, check our [daily build project](https://github.com/Neilpang/acmetest):

11
acme.sh
View File

@ -549,6 +549,8 @@ _stat() {
if stat -f '%Su:%Sg' "$1" 2>/dev/null ; then if stat -f '%Su:%Sg' "$1" 2>/dev/null ; then
return return
fi fi
return 1; #error, 'stat' not found
} }
#keyfile #keyfile
@ -1656,9 +1658,12 @@ issue() {
mkdir -p "$wellknown_path" mkdir -p "$wellknown_path"
printf "%s" "$keyauthorization" > "$wellknown_path/$token" printf "%s" "$keyauthorization" > "$wellknown_path/$token"
if [ ! "$usingApache" ] ; then if [ ! "$usingApache" ] ; then
webroot_owner=$(_stat $_currentRoot) if webroot_owner=$(_stat $_currentRoot) ; then
_debug "Changing owner/group of .well-known to $webroot_owner" _debug "Changing owner/group of .well-known to $webroot_owner"
chown -R $webroot_owner "$_currentRoot/.well-known" chown -R $webroot_owner "$_currentRoot/.well-known"
else
_debug "not chaning owner/group of webroot";
fi
fi fi
fi fi