Changeset View

Standalone View

				From a659f7297968befcbc25403fa54abc1aecdba43b Mon Sep 17 00:00:00 2001
				From: Fabio Forni <fabio@redaril.me>
				Date: Thu, 7 May 2020 22:58:13 +0200
				Subject: [PATCH] Use openjdk-8

				---
				projectlibre_build/resources/projectlibre.sh \| 18 ++++++++++++------
				1 file changed, 12 insertions(+), 6 deletions(-)

				diff --git a/projectlibre_build/resources/projectlibre.sh b/projectlibre_build/resources/projectlibre.sh
				index babfd31..3c86396 100755
				--- a/projectlibre_build/resources/projectlibre
				+++ b/projectlibre_build/resources/projectlibre
				@@ -56,15 +56,21 @@
				# logo it must direct them back to http://www.projectlibre.com.
				#*******************************************************************************

				-CONF_DIR="$HOME/.projectlibre"
				+if [ -d $XDG_CONFIG_HOME ]; then
				+ CONF_DIR="$XDG_CONFIG_HOME/projectlibre"
				+else
				+ CONF_DIR="$HOME/.config/projectlibre"
				+fi
				+
				+# Migrate the old conf dir
				+if [ -d "$HOME/.projectlibre" ]; then
				+ mv "$HOME/.projectlibre" "$CONF_DIR"
				+fi
				+
				RUN_CONF="$CONF_DIR/run.conf"
				VERSION_FILE="$CONF_DIR/java-version"
				-JAVA_INSTALL_DIR="/usr/java"
				+JAVA_INSTALL_DIR="/usr/lib64/openjdk-8"
				JAVA_INSTALL_DIR_EXE="bin/java"
				-JAVA_INSTALL_DIR2="/usr/lib/jvm"
				-JAVA_INSTALL_DIR_EXE2="bin/java"
				-JAVA_INSTALL_DIR3="/opt/ibm"
				-JAVA_INSTALL_DIR_EXE3="jre/bin/java"
				MIN_JAVA_VERSION="6"

				#Default conf values
				--
				2.26.2