Skip to content

Fixes for launchers #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 27, 2021
Merged

Fixes for launchers #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
51bcdc4
Additions to #68: realpath workaround for non GNU systems
khud Apr 13, 2021
7491ed6
Fix #65 for Unix systems
khud Apr 13, 2021
bd02acc
Support --add-opens flag for Windows
khud Apr 19, 2021
e617be2
Fix shell script
khud Apr 27, 2021
b310265
Fixes for shell script
asm0dey Apr 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 28 additions & 3 deletions bin/ki.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,31 @@
@echo off
setlocal enabledelayedexpansion

set SCRIPT_PATH=%~dp0
set KI_SHELL=%SCRIPT_PATH%\..\lib\ki-shell.jar
set SCRIPT_DIR=%~dp0
set KI_SHELL=%SCRIPT_DIR%\..\lib\ki-shell.jar
set JAVA_OPTS=%*

java -jar %KI_SHELL% %*
for /f "tokens=3" %%g in ('java -version 2^>^&1 ^| findstr /i "version"') do (
set JAVA_VERSION=%%g
)

set JAVA_VERSION=%JAVA_VERSION:"=%

for /f "delims=. tokens=1-3" %%v in ("%JAVA_VERSION%") do (
if %%v EQU 1 (
if %%w LSS 8 (
@echo java has version !JAVA_VERSION! but at least 1.8 is required
exit /b 1
)
) else (
set ADD_OPENS=--add-opens java.base/java.util=ALL-UNNAMED
if not defined JAVA_OPTS (
set JAVA_OPTS=!ADD_OPENS!
) else (
set JAVA_OPTS=!JAVA_OPTS! !ADD_OPENS!
)
)
java !JAVA_OPTS! -jar !KI_SHELL!
)

endlocal
39 changes: 37 additions & 2 deletions bin/ki.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,41 @@
#!/usr/bin/env bash

SCRIPT_DIR="$( dirname $(realpath "$0") )"
if command -v java &>/dev/null; then
_JAVA=java
elif [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then
_JAVA="$JAVA_HOME/bin/java"
else
echo "java not found"
exit 1
fi

if [[ "$_JAVA" ]]; then
JAVA_VERSION=$("$_JAVA" -version 2>&1 | awk -F '"' '/version/ {print $2}')
if [[ "$JAVA_VERSION" =~ ^1\.[0-8]+ ]]; then
if [[ "$JAVA_VERSION" =~ ^1\.[0-7]+ ]]; then
echo "java has version $JAVA_VERSION but at least 1.8 is required"
exit 1
fi
else
ADD_OPENS="--add-opens java.base/java.util=ALL-UNNAMED"
if [[ "$JAVA_OPTS" ]]; then
JAVA_OPTS="$JAVA_OPTS $ADD_OPENS"
else
JAVA_OPTS=$ADD_OPENS
fi
fi
fi

command -v realpath &>/dev/null || realpath() {
SCRIPT_PATH=$([[ $1 == /* ]] && echo "$1" || echo "$PWD/${1#./}")
if [[ -L "$SCRIPT_PATH" ]]; then
readlink "$SCRIPT_PATH"
else
echo $SCRIPT_PATH
fi
}

SCRIPT_DIR="$(dirname "$(realpath "$0")")"
KI_SHELL=$SCRIPT_DIR/../lib/ki-shell.jar

java -jar ${KI_SHELL} $@
$_JAVA $JAVA_OPTS -jar "${KI_SHELL}" $@