From fa574fe833330a4e19395738627822ad87b1ae43 Mon Sep 17 00:00:00 2001 From: neilpang Date: Wed, 16 Nov 2016 22:44:39 +0800 Subject: [PATCH] fix shfmt --- .travis.yml | 4 ++-- acme.sh | 6 +++--- dnsapi/dns_nsupdate.sh | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index e78787f6..cf708c2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,10 +15,10 @@ addons: script: - curl -sSL $SHFMT_URL -o ~/shfmt - chmod +x ~/shfmt - - shellcheck -V - - shellcheck -e SC2021,SC2126,SC2034 **/*.sh && echo "shellcheck OK" - ~/shfmt -l -w -i 2 . - git diff --exit-code && echo "shfmt OK" + - shellcheck -V + - shellcheck -e SC2021,SC2126,SC2034 **/*.sh && echo "shellcheck OK" - 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" - git clone https://github.com/Neilpang/acmetest.git && cp -r acme.sh acmetest/ && cd acmetest diff --git a/acme.sh b/acme.sh index 57420a85..ba4688cf 100755 --- a/acme.sh +++ b/acme.sh @@ -1325,7 +1325,7 @@ _clear_conf() { _sdkey="$2" if [ "$_c_c_f" ]; then _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 _err "config file is empty, can not clear" fi @@ -1427,7 +1427,7 @@ _startserver() { _exec_err return 1 fi - if [ "$DEBUG" ] ; then + if [ "$DEBUG" ]; then _exec_err fi return @@ -1443,7 +1443,7 @@ _startserver() { _exec_err exit 1 fi - if [ "$DEBUG" ] ; then + if [ "$DEBUG" ]; then _exec_err fi # done diff --git a/dnsapi/dns_nsupdate.sh b/dnsapi/dns_nsupdate.sh index a024e314..5e7af831 100755 --- a/dnsapi/dns_nsupdate.sh +++ b/dnsapi/dns_nsupdate.sh @@ -1,6 +1,5 @@ #!/usr/bin/env sh - ######## Public functions ##################### #Usage: dns_nsupdate_add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs" @@ -22,7 +21,7 @@ EOF _err "error updating domain" return 1 fi - + return 0 }