fix shfmt

This commit is contained in:
neilpang 2016-11-16 22:44:39 +08:00
parent 9a6e18ce80
commit fa574fe833
3 changed files with 6 additions and 7 deletions

View File

@ -15,10 +15,10 @@ addons:
script: script:
- curl -sSL $SHFMT_URL -o ~/shfmt - curl -sSL $SHFMT_URL -o ~/shfmt
- chmod +x ~/shfmt - chmod +x ~/shfmt
- shellcheck -V
- shellcheck -e SC2021,SC2126,SC2034 **/*.sh && echo "shellcheck OK"
- ~/shfmt -l -w -i 2 . - ~/shfmt -l -w -i 2 .
- git diff --exit-code && echo "shfmt OK" - git diff --exit-code && echo "shfmt OK"
- shellcheck -V
- shellcheck -e SC2021,SC2126,SC2034 **/*.sh && echo "shellcheck OK"
- cd .. - cd ..
- curl -sSL https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip -o ngrok-stable-linux-amd64.zip && unzip ngrok-stable-linux-amd64.zip && export NGROK_BIN="$(pwd)/ngrok" - curl -sSL https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip -o ngrok-stable-linux-amd64.zip && unzip ngrok-stable-linux-amd64.zip && export NGROK_BIN="$(pwd)/ngrok"
- git clone https://github.com/Neilpang/acmetest.git && cp -r acme.sh acmetest/ && cd acmetest - git clone https://github.com/Neilpang/acmetest.git && cp -r acme.sh acmetest/ && cd acmetest

View File

@ -1325,7 +1325,7 @@ _clear_conf() {
_sdkey="$2" _sdkey="$2"
if [ "$_c_c_f" ]; then if [ "$_c_c_f" ]; then
_conf_data="$(cat "$_c_c_f")" _conf_data="$(cat "$_c_c_f")"
echo "$_conf_data" | sed "s/^$_sdkey *=.*$//" > "$_c_c_f" echo "$_conf_data" | sed "s/^$_sdkey *=.*$//" >"$_c_c_f"
else else
_err "config file is empty, can not clear" _err "config file is empty, can not clear"
fi fi
@ -1427,7 +1427,7 @@ _startserver() {
_exec_err _exec_err
return 1 return 1
fi fi
if [ "$DEBUG" ] ; then if [ "$DEBUG" ]; then
_exec_err _exec_err
fi fi
return return
@ -1443,7 +1443,7 @@ _startserver() {
_exec_err _exec_err
exit 1 exit 1
fi fi
if [ "$DEBUG" ] ; then if [ "$DEBUG" ]; then
_exec_err _exec_err
fi fi
# done # done

View File

@ -1,6 +1,5 @@
#!/usr/bin/env sh #!/usr/bin/env sh
######## Public functions ##################### ######## Public functions #####################
#Usage: dns_nsupdate_add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs" #Usage: dns_nsupdate_add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"