diff --git a/ProgramExe/FlashTool b/ProgramExe/FlashTool index a8ef4be0..92a73e8e 100644 --- a/ProgramExe/FlashTool +++ b/ProgramExe/FlashTool @@ -38,11 +38,14 @@ then rootandudevcheck; - if test "${system64}" = "x86_64" + if test -z "${JAVA_HOME}" then - export JAVA_HOME=./x10flasher_lib/linjre64 - else - export JAVA_HOME=./x10flasher_lib/linjre32 + if test "${system64}" = "x86_64" + then + export JAVA_HOME=./x10flasher_lib/linjre64 + else + export JAVA_HOME=./x10flasher_lib/linjre32 + fi fi echo "Used java home : ${JAVA_HOME}" @@ -77,11 +80,14 @@ then else - if test "${system64}" = "x86_64" + if test -z "${JAVA_HOME}" then - export JAVA_HOME=./x10flasher_lib/macjre64 - else - export JAVA_HOME=./x10flasher_lib/macjre32 + if test "${system64}" = "x86_64" + then + export JAVA_HOME=./x10flasher_lib/macjre64 + else + export JAVA_HOME=./x10flasher_lib/macjre32 + fi fi echo "Used java home : ${JAVA_HOME}"