Avoid cleaning JDK security directory on CEK setup (#1053)

Fixes #1050 Signed-off-by: Ethan Dye <[email protected]>
openhab · Jul 26, 2020 · e779894 · e779894
1 parent ec398e0
commit e779894
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/functions/java-jre.bash b/functions/java-jre.bash
@@ -398,10 +398,9 @@ java_zulu_install_crypto_extension() {
 
   echo -n "$(timestamp) [openHABian] Installing Java Zulu CEK to enable unlimited cipher strength... "
   if ! cond_redirect mkdir -p "$jdkSecurity"; then echo "FAILED (create directory)"; return 1; fi
-  if ! cond_redirect rm -rf "${jdkSecurity:?}"/*; then echo "FAILED (clean directory)"; return 1; fi
-  if ! cond_redirect wget -qO "$policyTempLocation"/crypto.zip https://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip; then echo "FAILED (download)"; return 1; fi
-  if ! cond_redirect unzip "$policyTempLocation"/crypto.zip -d "$policyTempLocation"; then echo "FAILED (unzip)"; return 1; fi
-  if cond_redirect cp "$policyTempLocation"/ZuluJCEPolicies/*.jar "$jdkSecurity"; then echo "OK"; else echo "FAILED (copy)"; return 1; fi
+  if ! cond_redirect wget -qO "$policyTempLocation"/crypto.zip https://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip; then echo "FAILED (download)"; rm -rf "$policyTempLocation"; return 1; fi
+  if ! cond_redirect unzip "$policyTempLocation"/crypto.zip -d "$policyTempLocation"; then echo "FAILED (unzip)"; rm -rf "$policyTempLocation"; return 1; fi
+  if cond_redirect cp -u "$policyTempLocation"/ZuluJCEPolicies/*.jar "$jdkSecurity"; then echo "OK"; else echo "FAILED (copy)"; rm -rf "$policyTempLocation"; return 1; fi
 
   cond_redirect rm -rf "$policyTempLocation"
 }

diff --git a/functions/system.bash b/functions/system.bash
@@ -105,8 +105,11 @@ timezone_setting() {
 ##    setup_ntp(String option)
 ##
 setup_ntp() {
-  if running_in_docker || ! is_raspbian; then echo "$(timestamp) [openHABian] Enabling time synchronization using NTP... SKIPPED"; return 0; fi
-
+  if running_in_docker || ! is_raspbian; then
+    echo "$(timestamp) [openHABian] Enabling time synchronization using NTP... SKIPPED"
+    return 0
+  fi
+
   if [[ $1 == "enable" ]]; then
     echo -n "$(timestamp) [openHABian] Enabling time synchronization using NTP... "
     if ! cond_redirect cp "${BASEDIR:-/opt/openhabian}"/includes/50-timesyncd.conf /lib/dhcpcd/dhcpcd-hooks/; then echo "FAILED (copy)"; return 1; fi