le-issue

@@ -33,7 +33,7 @@ gen_renew_config() {
 
 usage() {
 	while read -r line; do printf '%s\n' "$line"; done <<- EOF
-		Usage: le-issue [options] <domain> [domain ...]
+		Usage: le [options] <domain> [domain ...]
 		   Options:
 		      -c <dir>        # Configuration directory. Default: \$HOME/.acme
 		      -a <dir>        # A dir to put challenges in. Default: /var/www/acme
@@ -122,7 +122,7 @@ main() {
 	acme-tiny \
 		--account-key "$cfg_dir/account.key" \
 		--csr "$cfg_dir/domains/${domains[0]}/request.csr" \
-		--acme-dir "$challenge_dir" | grep -vE '^$' > "$cfg_dir/domains/${domains[0]}/certificate.pem"
+		--acme-dir "$challenge_dir" > "$cfg_dir/domains/${domains[0]}/certificate.pem"
 
 	if (( $? )); then
 		return 1
@@ -130,7 +130,12 @@ main() {
 
 	gen_renew_config "${domains[@]}" > "$cfg_dir/domains/${domains[0]}/renew.cfg"
 
-	ln -fs "$cfg_dir/domains/${domains[0]}/certificate.pem" "$cfg_dir/domains/${domains[0]}/fullchain.pem"
+	if ! [[ -f "$cfg_dir/chain.pem" ]]; then
+		err "Intermediate certificate not found, downloading."
+		curl "https://letsencrypt.org/certs/lets-encrypt-x3-cross-signed.pem" > "$cfg_dir/chain.pem"
+	fi
+
+	cat "$cfg_dir/domains/${domains[0]}/certificate.pem" "$cfg_dir/chain.pem" > "$cfg_dir/domains/${domains[0]}/fullchain.pem"
 
 	err "Your certificate is available at $cfg_dir/domains/${domains[0]}/fullchain.pem"
 }

le-renew

@@ -7,7 +7,7 @@ done
 
 usage() {
 	while read -r line; do printf '%s\n' "$line"; done <<- EOF
-		Usage: le-renew [options] <domain> [domain ...]
+		Usage: le [options] <-d domain> [-d domain] ...
 		   Options:
 		      -c <dir>        # Configuration directory. Default: \$HOME/.acme
 		      -t <sec>        # How many seconds till exipration to consider as soon. Default: 259200 (3 days)