fix: be compatible with mac os

Author: Fishdrowned

.gitignore

@@ -1,4 +1,4 @@
 /.idea/
-/out/*
+/out/
 /deploy-passport.sh
 /cert.all.sh

gen.cert.sh

@@ -3,27 +3,15 @@
 if [ -z "$1" ]
 then
     echo
-    echo 'Issue a wildcard SSL certification with Fishdrowned ROOT CA'
+    echo 'Issue a wildcard SSL certificate with Fishdrowned ROOT CA'
     echo
     echo 'Usage: ./gen.cert.sh <domain> [<domain2>] [<domain3>] [<domain4>] ...'
     echo '    <domain>          The domain name of your site, like "example.dev",'
-    echo '                      you will get a certification for *.example.dev'
+    echo '                      you will get a certificate for *.example.dev'
     echo '                      Multiple domains are acceptable'
     exit;
 fi
 
-if [ ! -d "./out/newcerts" ]; then
-    mkdir -p "./out/newcerts"
-fi
-
-if [ ! -f "./out/index.txt" ]; then
-    touch "./out/index.txt"
-fi
-
-if [ ! -f "./out/serial" ]; then
-    touch "./out/serial"
-    echo 1000 > ./out/serial
-fi
 SAN=""
 for var in "$@"
 do
@@ -34,6 +22,11 @@ SAN=${SAN:0:${#SAN}-1}
 # Move to root directory
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
+# Generate root certificate if not exists
+if [ ! -f "out/root.crt" ]; then
+    bash gen.root.sh
+fi
+
 # Create domain directory
 BASE_DIR="out/$1"
 TIME=`date +%Y%m%d-%H%M`
@@ -48,21 +41,25 @@ openssl req -new -out "${DIR}/$1.csr.pem" \
         <(printf "[SAN]\nsubjectAltName=${SAN}")) \
     -subj "/C=CN/ST=Guangdong/L=Guangzhou/O=Fishdrowned/OU=$1/CN=*.$1"
 
-# Issue certification
+# Issue certificate
 # openssl ca -batch -config ./ca.cnf -notext -in "${DIR}/$1.csr.pem" -out "${DIR}/$1.cert.pem"
 openssl ca -config ./ca.cnf -batch -notext \
     -in "${DIR}/$1.csr.pem" \
     -out "${DIR}/$1.crt" \
     -cert ./out/root.crt \
     -keyfile ./out/root.key.pem
 
-# Chain certification with CA
+# Chain certificate with CA
 cat "${DIR}/$1.crt" ./out/root.crt > "${DIR}/$1.bundle.crt"
 ln -snf "./${TIME}/$1.bundle.crt" "${BASE_DIR}/$1.bundle.crt"
 ln -snf "./${TIME}/$1.crt" "${BASE_DIR}/$1.crt"
 ln -snf "../cert.key.pem" "${BASE_DIR}/$1.key.pem"
+ln -snf "../root.crt" "${BASE_DIR}/root.crt"
 
-# Output certifications
+# Output certificates
 echo
-echo "Certifications are located in:"
-ls -la `pwd`/${BASE_DIR}/*.*
+echo "Certificates are located in:"
+
+LS=$([[ `ls --help | grep '\-\-color'` ]] && echo "ls --color" || echo "ls -G")
+
+${LS} -la `pwd`/${BASE_DIR}/*.*

gen.root.sh

@@ -1,9 +1,13 @@
 #!/usr/bin/env bash
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-folder="./out"
-if [ ! -d "$folder" ]; then
-    mkdir "$folder"
+if [ -f "out/root.crt" ]; then
+    echo Root certificate already exists.
+    exit 1
+fi
+
+if [ ! -d "out" ]; then
+    bash flush.sh
 fi
 
 # Generate root cert along with root key