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
44edb2bd
Commit
44edb2bd
authored
Nov 09, 2016
by
neilpang
Browse files
fix shellcheck warnings
parent
201aa244
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
44edb2bd
...
@@ -1878,7 +1878,7 @@ _setApache() {
...
@@ -1878,7 +1878,7 @@ _setApache() {
#test the conf first
#test the conf first
_info "Checking if there is an error in the apache config file before starting."
_info "Checking if there is an error in the apache config file before starting."
if ! _exec $_APACHECTL -t >/dev/null; then
if ! _exec
"
$_APACHECTL
"
-t >/dev/null; then
_exec_err
_exec_err
_err "The apache config file has error, please fix it first, then try again."
_err "The apache config file has error, please fix it first, then try again."
_err "Don't worry, there is nothing changed to your system."
_err "Don't worry, there is nothing changed to your system."
...
@@ -1940,7 +1940,7 @@ Allow from all
...
@@ -1940,7 +1940,7 @@ Allow from all
chmod 755 "$ACME_DIR"
chmod 755 "$ACME_DIR"
fi
fi
if ! _exec $_APACHECTL graceful; then
if ! _exec
"
$_APACHECTL
"
graceful; then
_exec_err
_exec_err
_err "$_APACHECTL graceful error, please contact me."
_err "$_APACHECTL graceful error, please contact me."
_restoreApache
_restoreApache
...
@@ -1951,7 +1951,7 @@ Allow from all
...
@@ -1951,7 +1951,7 @@ Allow from all
}
}
_clearup() {
_clearup() {
_stopserver $serverproc
_stopserver
"
$serverproc
"
serverproc=""
serverproc=""
_restoreApache
_restoreApache
_clearupdns
_clearupdns
...
@@ -2693,7 +2693,7 @@ issue() {
...
@@ -2693,7 +2693,7 @@ issue() {
fi
fi
if [ ! "$usingApache" ]; then
if [ ! "$usingApache" ]; then
if webroot_owner=$(_stat $_currentRoot); then
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
else
...
@@ -2772,7 +2772,7 @@ issue() {
...
@@ -2772,7 +2772,7 @@ issue() {
_debug "sleep 2 secs to verify"
_debug "sleep 2 secs to verify"
sleep 2
sleep 2
_debug "checking"
_debug "checking"
response="$(_get $uri)"
response="$(_get
"
$uri
"
)"
if [ "$?" != "0" ]; then
if [ "$?" != "0" ]; then
_err "$d:Verify error:$response"
_err "$d:Verify error:$response"
_clearupwebbroot "$_currentRoot" "$removelevel" "$token"
_clearupwebbroot "$_currentRoot" "$removelevel" "$token"
...
@@ -3663,9 +3663,9 @@ _installalias() {
...
@@ -3663,9 +3663,9 @@ _installalias() {
_envfile="$LE_WORKING_DIR/$PROJECT_ENTRY.env"
_envfile="$LE_WORKING_DIR/$PROJECT_ENTRY.env"
if [ "$_upgrading" ] && [ "$_upgrading" = "1" ]; then
if [ "$_upgrading" ] && [ "$_upgrading" = "1" ]; then
echo "$(cat $_envfile)" | sed "s|^LE_WORKING_DIR.*$||" >"$_envfile"
echo "$(cat
"
$_envfile
"
)" | sed "s|^LE_WORKING_DIR.*$||" >"$_envfile"
echo "$(cat $_envfile)" | sed "s|^alias le.*$||" >"$_envfile"
echo "$(cat
"
$_envfile
"
)" | sed "s|^alias le.*$||" >"$_envfile"
echo "$(cat $_envfile)" | sed "s|^alias le.sh.*$||" >"$_envfile"
echo "$(cat
"
$_envfile
"
)" | sed "s|^alias le.sh.*$||" >"$_envfile"
fi
fi
_setopt "$_envfile" "export LE_WORKING_DIR" "=" "\"$LE_WORKING_DIR\""
_setopt "$_envfile" "export LE_WORKING_DIR" "=" "\"$LE_WORKING_DIR\""
...
...
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