From af871b60fea62d938a9262fe79ee43ecc5005788 Mon Sep 17 00:00:00 2001
From: Danilo Bento <ehrhardt@geocities.com>
Date: Fri, 1 Jan 2021 10:19:36 -0300
Subject: [PATCH 1/5] dos2unix

---
 utils/jks2pem | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/utils/jks2pem b/utils/jks2pem
index 7d39876..5575e0c 100755
--- a/utils/jks2pem
+++ b/utils/jks2pem
@@ -1,21 +1,21 @@
-#!/bin/bash
-# --------------------------------------
-# converts a java keystore file to PEM
-# requires: jdk and openssl
-# --------------------------------------
-# thanks to: 
-# https://www.calazan.com/how-to-convert-a-java-keystore-jks-to-pem-format/
-# --------------------------------------
-
-JKSFILE=$1
-PEMFILE=$2
-
-keytool -importkeystore \
-        -srckeystore ${JKSFILE} \
-        -destkeystore ${JKSFILE}.p12 \
-        -srcstoretype jks \
-        -deststoretype pkcs12
-
-openssl pkcs12 \
-        -in ${JKSFILE}.p12 
-        -out $PEMFILE
+#!/bin/bash
+# --------------------------------------
+# converts a java keystore file to PEM
+# requires: jdk and openssl
+# --------------------------------------
+# thanks to:
+# https://www.calazan.com/how-to-convert-a-java-keystore-jks-to-pem-format/
+# --------------------------------------
+
+JKSFILE=$1
+PEMFILE=$2
+
+keytool -importkeystore \
+        -srckeystore ${JKSFILE} \
+        -destkeystore ${JKSFILE}.p12 \
+        -srcstoretype jks \
+        -deststoretype pkcs12
+
+openssl pkcs12 \
+        -in ${JKSFILE}.p12 
+        -out $PEMFILE

From 6ec550a39d647acc60612bb8cbbeffb7147329a2 Mon Sep 17 00:00:00 2001
From: Danilo Bento <ehrhardt@geocities.com>
Date: Fri, 1 Jan 2021 10:20:58 -0300
Subject: [PATCH 2/5] no bashisms, use the POSIX shell

---
 utils/jks2pem | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/jks2pem b/utils/jks2pem
index 5575e0c..c2d0118 100755
--- a/utils/jks2pem
+++ b/utils/jks2pem
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # --------------------------------------
 # converts a java keystore file to PEM
 # requires: jdk and openssl

From 21e987fd34b69130989a159530effd812bbdec85 Mon Sep 17 00:00:00 2001
From: Danilo Bento <ehrhardt@geocities.com>
Date: Fri, 1 Jan 2021 10:24:23 -0300
Subject: [PATCH 3/5] support file names with spaces

---
 utils/jks2pem | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/utils/jks2pem b/utils/jks2pem
index c2d0118..057c7da 100755
--- a/utils/jks2pem
+++ b/utils/jks2pem
@@ -7,15 +7,15 @@
 # https://www.calazan.com/how-to-convert-a-java-keystore-jks-to-pem-format/
 # --------------------------------------
 
-JKSFILE=$1
-PEMFILE=$2
+JKSFILE="$1"
+PEMFILE="$2"
 
 keytool -importkeystore \
-        -srckeystore ${JKSFILE} \
-        -destkeystore ${JKSFILE}.p12 \
+        -srckeystore "${JKSFILE}" \
+        -destkeystore "${JKSFILE}.p12" \
         -srcstoretype jks \
         -deststoretype pkcs12
 
 openssl pkcs12 \
-        -in ${JKSFILE}.p12 
-        -out $PEMFILE
+        -in "${JKSFILE}.p12" 
+        -out "$PEMFILE"

From 596709ed0d52956f19a444efea68d251f45a8fcc Mon Sep 17 00:00:00 2001
From: Danilo Bento <ehrhardt@geocities.com>
Date: Fri, 1 Jan 2021 10:25:19 -0300
Subject: [PATCH 4/5] missing backslash

---
 utils/jks2pem | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/jks2pem b/utils/jks2pem
index 057c7da..0fb90de 100755
--- a/utils/jks2pem
+++ b/utils/jks2pem
@@ -17,5 +17,5 @@ keytool -importkeystore \
         -deststoretype pkcs12
 
 openssl pkcs12 \
-        -in "${JKSFILE}.p12" 
+        -in "${JKSFILE}.p12" \
         -out "$PEMFILE"

From 38f0052a8d46d1b4596adc66b846673aafd78dfc Mon Sep 17 00:00:00 2001
From: Danilo Bento <ehrhardt@geocities.com>
Date: Fri, 1 Jan 2021 10:30:43 -0300
Subject: [PATCH 5/5] adds the option to remove the intermediate pkcs12 file

---
 utils/jks2pem | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utils/jks2pem b/utils/jks2pem
index 0fb90de..9c0fdb7 100755
--- a/utils/jks2pem
+++ b/utils/jks2pem
@@ -19,3 +19,5 @@ keytool -importkeystore \
 openssl pkcs12 \
         -in "${JKSFILE}.p12" \
         -out "$PEMFILE"
+
+rm -i "${JKSFILE}.p12"