Page MenuHomeSolus
Differential D9028 Diff 21708 files/0001-fix-jdk-search-and-use-java-11.patch

Changeset View

Standalone View

View Options

files/0001-fix-jdk-search-and-use-java-11.patch

  • This file was moved from files/Use-openjdk-8.patch.
From a659f7297968befcbc25403fa54abc1aecdba43b Mon Sep 17 00:00:00 2001 From 1a1882e7731dfdb25a572b8ccf65fc72b0296939 Mon Sep 17 00:00:00 2001
From: Fabio Forni <livingsilver94.solus@redaril.me> From: Campbell Jones <git@serebit.com>
Date: Thu, 7 May 2020 22:58:13 +0200 Date: Mon, 8 Jun 2020 19:58:01 -0400
Subject: [PATCH] Use openjdk-8 Subject: [PATCH] fix jdk search and use java 11
--- ---
projectlibre_build/resources/projectlibre.sh | 18 ++++++++++++------ projectlibre_build/resources/projectlibre | 20 +++++++++++++-------
1 file changed, 12 insertions(+), 6 deletions(-) 1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/projectlibre_build/resources/projectlibre.sh b/projectlibre_build/resources/projectlibre.sh diff --git a/projectlibre_build/resources/projectlibre b/projectlibre_build/resources/projectlibre
index babfd31..3c86396 100755 index 9f38901..c460cc1 100755
--- a/projectlibre_build/resources/projectlibre --- a/projectlibre_build/resources/projectlibre
+++ b/projectlibre_build/resources/projectlibre +++ b/projectlibre_build/resources/projectlibre
@@ -56,15 +56,21 @@ @@ -56,15 +56,21 @@
# logo it must direct them back to http://www.projectlibre.com. # logo it must direct them back to http://www.projectlibre.com.
#******************************************************************************* #*******************************************************************************
-CONF_DIR="$HOME/.projectlibre" -CONF_DIR="$HOME/.projectlibre"
+if [ -d $XDG_CONFIG_HOME ]; then +if [ -d "$XDG_CONFIG_HOME" ]; then
+ CONF_DIR="$XDG_CONFIG_HOME/projectlibre" + CONF_DIR="$XDG_CONFIG_HOME/projectlibre"
+else +else
+ CONF_DIR="$HOME/.config/projectlibre" + CONF_DIR="$HOME/.config/projectlibre"
+fi +fi
+ +
+# Migrate the old conf dir +# Migrate the old conf dir
+if [ -d "$HOME/.projectlibre" ]; then +if [ -d "$HOME/.projectlibre" ]; then
+ mv "$HOME/.projectlibre" "$CONF_DIR" + mv "$HOME/.projectlibre" "$CONF_DIR"
+fi +fi
+ +
RUN_CONF="$CONF_DIR/run.conf" RUN_CONF="$CONF_DIR/run.conf"
VERSION_FILE="$CONF_DIR/java-version" VERSION_FILE="$CONF_DIR/java-version"
-JAVA_INSTALL_DIR="/usr/java" -JAVA_INSTALL_DIR="/usr/java"
+JAVA_INSTALL_DIR="/usr/lib64/openjdk-8" +JAVA_INSTALL_DIR="/usr/lib64/openjdk-11"
JAVA_INSTALL_DIR_EXE="bin/java" JAVA_INSTALL_DIR_EXE="bin/java"
-JAVA_INSTALL_DIR2="/usr/lib/jvm" -JAVA_INSTALL_DIR2="/usr/lib/jvm"
-JAVA_INSTALL_DIR_EXE2="bin/java" -JAVA_INSTALL_DIR_EXE2="bin/java"
-JAVA_INSTALL_DIR3="/opt/ibm" -JAVA_INSTALL_DIR3="/opt/ibm"
-JAVA_INSTALL_DIR_EXE3="jre/bin/java" -JAVA_INSTALL_DIR_EXE3="jre/bin/java"
MIN_JAVA_VERSION="6" MIN_JAVA_VERSION="6"
#Default conf values #Default conf values
@@ -239,7 +245,7 @@ if [ "$JAVA_OK" -eq "0" ]; then
check_java "$J"
fi
if [ "$JAVA_OK" -eq "0" ]; then
- J="$JAVA_INSTALL_DIR/default/$JAVA_INSTALL_DIR_EXE"
+ J="$JAVA_INSTALL_DIR/$JAVA_INSTALL_DIR_EXE"
if [ -x "$J" ]; then
check_java "$J"
fi
-- --
2.26.2 2.27.0
Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.