From 22b3f57e5c70830616d555fa000ab2b01be755ff Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Thu, 23 Jan 2020 21:44:17 +0300 Subject: [PATCH] [platform] fix custom jdk path file lookup on Linux follow-up: 979f96865eacb450c1f75023fa2e745fbe555c1a, 4b1a9f25e259de59bd084a476866a34d8ec156af GitOrigin-RevId: e44109c58dfb228f1eca7ebd27589e75397e8816 --- .../resources/linux/scripts/executable-template.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/build-scripts/resources/linux/scripts/executable-template.sh b/platform/build-scripts/resources/linux/scripts/executable-template.sh index db33f19e49d3..e311e8e3d348 100755 --- a/platform/build-scripts/resources/linux/scripts/executable-template.sh +++ b/platform/build-scripts/resources/linux/scripts/executable-template.sh @@ -63,8 +63,8 @@ if [ -n "$__product_uc___JDK" ] && [ -x "$__product_uc___JDK/bin/java" ]; then JDK="$__product_uc___JDK" fi -if [ -z "$JDK" ] && [ -s "${XDG_CONFIG_HOME:-$HOME/.config}/__system_selector__/__vm_options__.jdk" ]; then - USER_JRE=$("$CAT" "${XDG_CONFIG_HOME:-$HOME/.config}/__system_selector__/__vm_options__.jdk") +if [ -z "$JDK" ] && [ -s "${XDG_CONFIG_HOME:-$HOME/.config}/__product_vendor__/__system_selector__/__vm_options__.jdk" ]; then + USER_JRE=$("$CAT" "${XDG_CONFIG_HOME:-$HOME/.config}/__product_vendor__/__system_selector__/__vm_options__.jdk") if [ ! -d "$USER_JRE" ]; then USER_JRE="$IDE_HOME/$USER_JRE" fi