From 5b44c074f1d0d00abc082fc6a0a1e7ceca71ba78 Mon Sep 17 00:00:00 2001
From: Chris Stewart <stewart.chris1234@gmail.com>
Date: Mon, 11 Jul 2022 15:04:04 -0500
Subject: [PATCH] Fix `chmod: jre/bin/java: No such file or directory` errors
 (#4493)

* Fix 'chmod: jre/bin/java: No such file or directory' errors

* Remove echos

* Remove duplicate quaratine in oracle-server-extra-startup-script.sh
---
 app/cli/src/universal/cli-extra-startup-script.sh |  9 ++++++++-
 .../oracle-server-extra-startup-script.sh         | 15 +++++++--------
 .../wallet-server-extra-startup-script.sh         | 11 ++++++++++-
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/app/cli/src/universal/cli-extra-startup-script.sh b/app/cli/src/universal/cli-extra-startup-script.sh
index d0537b54ff..d1c332d7f4 100644
--- a/app/cli/src/universal/cli-extra-startup-script.sh
+++ b/app/cli/src/universal/cli-extra-startup-script.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 
 if [[ "$OS" == "OSX" ]]; then
   #mac doesn't allow random binaries to be executable
@@ -5,4 +6,10 @@ if [[ "$OS" == "OSX" ]]; then
   xattr -d com.apple.quarantine jre/bin/java
 fi
 
-chmod +x jre/bin/java #make sure java is executable
\ No newline at end of file
+if test -f "jre/bin/java"; then
+  chmod +x jre/bin/java #make sure java is executable
+fi
+
+if test -f "../jre/bin/java" ; then
+  chmod +x ../jre/bin/java #make sure java is executable
+fi
diff --git a/app/oracle-server/src/universal/oracle-server-extra-startup-script.sh b/app/oracle-server/src/universal/oracle-server-extra-startup-script.sh
index 471c0d0997..8b7a16cbd4 100644
--- a/app/oracle-server/src/universal/oracle-server-extra-startup-script.sh
+++ b/app/oracle-server/src/universal/oracle-server-extra-startup-script.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 
 if [[ "$OS" == "OSX" ]]; then
   #mac doesn't allow random binaries to be executable
@@ -5,15 +6,13 @@ if [[ "$OS" == "OSX" ]]; then
   xattr -d com.apple.quarantine jre/bin/java
 fi
 
-chmod +x jre/bin/java #make sure java is executable
-
-
-if [[ "$OS" == "OSX" ]]; then
-  #mac doesn't allow random binaries to be executable
-  #remove the quarantine attribute so java is executable on mac
-  xattr -d com.apple.quarantine jre/bin/java
+if test -f "jre/bin/java"; then
+  chmod +x jre/bin/java #make sure java is executable
+fi
+
+if test -f "../jre/bin/java" ; then
+  chmod +x ../jre/bin/java #make sure java is executable
 fi
-chmod +x jre/bin/java #make sure java is executable
 
 get_java_no_jlink() {
   if [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]];  then
diff --git a/app/server/src/universal/wallet-server-extra-startup-script.sh b/app/server/src/universal/wallet-server-extra-startup-script.sh
index 03f198483b..78ec0b2e15 100644
--- a/app/server/src/universal/wallet-server-extra-startup-script.sh
+++ b/app/server/src/universal/wallet-server-extra-startup-script.sh
@@ -1,10 +1,19 @@
+#!/bin/bash
+
 if [[ "$OS" == "OSX" ]]; then
   #mac doesn't allow random binaries to be executable
   #remove the quarantine attribute so java is executable on mac
   xattr -d com.apple.quarantine jre/bin/java
 fi
 
-chmod +x jre/bin/java #make sure java is executable
+if test -f "jre/bin/java"; then
+  chmod +x jre/bin/java #make sure java is executable
+fi
+
+if test -f "../jre/bin/java" ; then
+  chmod +x ../jre/bin/java #make sure java is executable
+fi
+
 
 chip=$(uname -m)