Browse Source

fix shfmt

neilpang 8 years ago
parent
commit
fa574fe833
3 changed files with 6 additions and 7 deletions
  1. 2 2
      .travis.yml
  2. 3 3
      acme.sh
  3. 1 2
      dnsapi/dns_nsupdate.sh

+ 2 - 2
.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

+ 3 - 3
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

+ 1 - 2
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
 }