Merge branch 'master' of https://github.com/Neilpang/le

README.md

@@ -11,6 +11,7 @@ Do NOT require to be `root/sudoer`.
 #Tested OS
 1. Ubuntu/Debian.
 2. CentOS
+3. Windows (cygwin with curl, openssl and crontab included)
 
 
 #Supported Mode
@@ -27,7 +28,7 @@ Do NOT require to be `root/sudoer`.
 ```
 ./le.sh install
 ```
-You don't have to be root then, altough it is recommended.
+You don't have to be root then, although it is recommended.
 
 Which does 3 jobs:
 * create and copy `le.sh` to your home dir:  `~/.le`
@@ -44,7 +45,7 @@ root@v1:~# le.sh
 https://github.com/Neilpang/le
 v1.1.1
 Usage: le.sh  [command] ...[args]....
-Avalible commands:
+Available commands:
 
 install:
   Install le.sh to your system.
@@ -105,7 +106,7 @@ The issued cert will be renewed every 80 days automatically.
 
 # Install issued cert to apache/nginx etc.
 ```
-le installcert  aa.com /path/to/certfile/in/apache/nginx  /path/to/keyfile/in/apache/nginx  /path/to/ca/certfile/apahce/nginx   "service apache2|nginx reload"
+le installcert  aa.com /path/to/certfile/in/apache/nginx  /path/to/keyfile/in/apache/nginx  /path/to/ca/certfile/apache/nginx   "service apache2|nginx reload"
 ```
 
 Install the issued cert/key to the production apache or nginx path.
@@ -226,7 +227,7 @@ License is GPLv3
 
 Please Star and Fork me.
 
-Issues and pullrequests are welcomed.
+Issues and pull requests are welcomed.
 
 
 

dnsapi/dns-myapi.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 #Here is a sample custom api script.
-#This file name is "dhs-myapi.sh"
-#So, here must be a method   dhs-myapi-add()
+#This file name is "dns-myapi.sh"
+#So, here must be a method   dns-myapi-add()
 #Which will be called by le.sh to add the txt record to your api system.
 #returns 0 meanst success, otherwise error.
 

le.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-VER=1.1.3
+VER=1.1.4
 PROJECT="https://github.com/Neilpang/le"
 
 DEFAULT_CA="https://acme-v01.api.letsencrypt.org"
@@ -293,6 +293,18 @@ _initpath() {
       SUDO=sudo
     fi
   fi
+  
+  if [ -z "$LE_WORKING_DIR" ]; then
+    LE_WORKING_DIR=$HOME/.le
+  fi
+  
+  if [ -z "$ACCOUNT_CONF_PATH" ] ; then
+    ACCOUNT_CONF_PATH="$LE_WORKING_DIR/account.conf"
+  fi
+  
+  if [ -f "$ACCOUNT_CONF_PATH" ] ; then
+    source "$ACCOUNT_CONF_PATH"
+  fi
 
   if [ -z "$API" ] ; then
     if [ -z "$STAGE" ] ; then
@@ -303,10 +315,6 @@ _initpath() {
     fi  
   fi
   
-  if [ -z "$LE_WORKING_DIR" ]; then
-    LE_WORKING_DIR=$HOME/.le
-  fi
-  
   if [ -z "$ACME_DIR" ] ; then
     ACME_DIR="/home/.acme"
   fi
@@ -322,13 +330,7 @@ _initpath() {
     ACCOUNT_KEY_PATH="$LE_WORKING_DIR/account.key"
   fi
   
-  if [ -z "$ACCOUNT_CONF_PATH" ] ; then
-    ACCOUNT_CONF_PATH="$LE_WORKING_DIR/account.conf"
-  fi
-  
-  if [ -f "$ACCOUNT_CONF_PATH" ] ; then
-    source "$ACCOUNT_CONF_PATH"
-  fi
+
   
   if [ -z "$domain" ] ; then
     return 0
@@ -829,7 +831,7 @@ issue() {
 
   if [ -z "$Le_LinkCert" ] ; then
     response="$(echo $response | openssl base64 -d)"
-    _err "Sign failed: $(echo "$response" | grep -o  '"detail":"[^"]*"')"
+    _err "Sign failed: $response"
     return 1
   fi