From da74fc8890dbfc0a1aeaa992f1a28ffb3f54d8fc Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Mon, 16 Dec 2019 01:03:02 +0900 Subject: Fix installer --- installer/install-eclipse-jdt-ls.cmd | 6 ++---- installer/install-eclipse-jdt-ls.sh | 7 +++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/installer/install-eclipse-jdt-ls.cmd b/installer/install-eclipse-jdt-ls.cmd index 569de2a..131737f 100755 --- a/installer/install-eclipse-jdt-ls.cmd +++ b/installer/install-eclipse-jdt-ls.cmd @@ -13,11 +13,9 @@ echo @echo off ^ setlocal enabledelayedexpansion ^ -cd %%~dp0 ^ +for %%%%F in (%%~dp0/plugins/org.eclipse.equinox.launcher_*.jar) do ( ^ -for %%%%F in (plugins/org.eclipse.equinox.launcher*win32*.jar) do ( ^ - - set launcher=plugins/%%%%F ^ + set launcher=%%~dp0/plugins/%%%%F ^ ) ^ diff --git a/installer/install-eclipse-jdt-ls.sh b/installer/install-eclipse-jdt-ls.sh index f0cc9a5..44c63f2 100755 --- a/installer/install-eclipse-jdt-ls.sh +++ b/installer/install-eclipse-jdt-ls.sh @@ -1,5 +1,4 @@ #!/bin/bash -@echo off cd $(dirname $0) [ -d ../servers/eclipse-jdt-ls ] && rm -rf ../servers/eclipse-jdt-ls @@ -13,9 +12,9 @@ rm jdt-language-server-latest.tar.gz cat < eclipse-jdt-ls #!/bin/sh -cd \$(dirname \$0) -LAUNCHER=$(ls ./plugins/org.eclipse.equinox.launcher*linux*.jar) -java -Declipse.application=org.eclipse.jdt.ls.core.id1 -Dosgi.bundles.defaultStartLevel=4 -Declipse.product=org.eclipse.jdt.ls.core.product -Dlog.protocol=true -Dlog.level=ALL -noverify -Xmx1G -javaagent:./lombok.jar -Xbootclasspath/a:./lombok.jar -jar \$LAUNCHER -configuration ./config_linux -data ./data +DIR=\$(cd \$(dirname \$0); pwd) +LAUNCHER=\$(ls \$DIR/plugins/org.eclipse.equinox.launcher_*.jar) +java -Declipse.application=org.eclipse.jdt.ls.core.id1 -Dosgi.bundles.defaultStartLevel=4 -Declipse.product=org.eclipse.jdt.ls.core.product -Dlog.protocol=true -Dlog.level=ALL -noverify -Xmx1G -javaagent:\$DIR/lombok.jar -Xbootclasspath/a:\$DIR/lombok.jar -jar \$LAUNCHER -configuration \$DIR/config_linux -data \$DIR/data EOF chmod +x eclipse-jdt-ls -- cgit v1.2.3-54-g00ecf