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 5c4c1934cb..e7838dd0e3 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,21 +1,24 @@ #!/bin/bash -if test -f "jre/bin/java"; then - 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 [[ -z "$DISABLE_JLINK" ]]; then + if test -f "jre/bin/java"; then + 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 fi - chmod +x jre/bin/java #make sure java is executable -fi -if test -f "../jre/bin/java" ; then - 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 + 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 fi - chmod +x ../jre/bin/java #make sure java is executable fi get_java_no_jlink() { 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 556041125d..23f8d52879 100644 --- a/app/server/src/universal/wallet-server-extra-startup-script.sh +++ b/app/server/src/universal/wallet-server-extra-startup-script.sh @@ -1,27 +1,28 @@ #!/bin/bash -if test -f "jre/bin/java"; then - 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 -fi -if test -f "../jre/bin/java" ; then - 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 [[ -z "$DISABLE_JLINK" ]]; then + if test -f "jre/bin/java"; then + 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 fi - chmod +x ../jre/bin/java #make sure java is executable -fi + if test -f "../jre/bin/java" ; then + 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 + fi +fi chip=$(uname -m) - get_java_no_jlink() { if [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then echo "$JAVA_HOME/bin/java"