Skip to content

Commit 9e74a88

Browse files
jaybocc2jaybocc2
committed
just find all classpath jars since versions are not pinned and may change dynamically
fix scripts to match existing /bin/sh and be sh posix compliant (drop bash features)
1 parent 5ec58f6 commit 9e74a88

11 files changed

+23
-20
lines changed

‎dist/debug_adapter_linux.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
2-
DIST_DIR=$(dirname $(readlink -f "${BASH_SOURCE[0]}"))
2+
DIST_DIR=$(dirname $(readlink -f "$0"))
33
${DIST_DIR}/launch_linux.sh org.javacs.debug.JavaDebugServer $@

‎dist/debug_adapter_mac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
2-
DIST_DIR=$(dirname $(readlink -f "${BASH_SOURCE[0]}"))
2+
DIST_DIR=$(dirname $(readlink -f "$0"))
33
${DIST_DIR}/launch_mac.sh org.javacs.debug.JavaDebugServer $@

‎dist/debug_adapter_windows.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
2-
DIST_DIR=$(dirname $(readlink -f "${BASH_SOURCE[0]}"))
2+
DIST_DIR=$(dirname $(readlink -f "$0"))
33
${DIST_DIR}/launch_windows.sh org.javacs.debug.JavaDebugServer $@

‎dist/java-debug-server

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
#!/bin/bash
1+
#!/bin/sh
22

33
OS="unknown"
44
if which -s uname;then
55
OS=$(uname |tr '[:upper:]' '[:lower:]')
66
fi
7-
DIST_DIR=$(dirname $(readlink -f "${BASH_SOURCE[0]}"))
8-
if [[ "${OS}" == 'darwin' ]]; then
7+
DIST_DIR=$(dirname $(readlink -f "$0"))
8+
if [ "${OS}" = 'darwin' ]; then
99
${DIST_DIR}/debug_adapter_mac.sh $@
10-
elif [[ "${OS}" == 'linux' ]]; then
10+
elif [ "${OS}" = 'linux' ]; then
1111
${DIST_DIR}/debug_adapter_linux.sh $@
1212
else
1313
${DIST_DIR}/debug_adapter_windows.sh $@

‎dist/java-language-server

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
#!/bin/bash
1+
#!/bin/sh
22

33
OS="unknown"
44
if which -s uname;then
55
OS=$(uname |tr '[:upper:]' '[:lower:]')
66
fi
7-
DIST_DIR=$(dirname $(readlink -f "${BASH_SOURCE[0]}"))
8-
if [[ "${OS}" == 'darwin' ]]; then
7+
DIST_DIR=$(dirname $(readlink -f "$0"))
8+
if [ "${OS}" = 'darwin' ]; then
99
${DIST_DIR}/lang_server_mac.sh $@
10-
elif [[ "${OS}" == 'linux' ]]; then
10+
elif [ "${OS}" = 'linux' ]; then
1111
${DIST_DIR}/lang_server_linux.sh $@
1212
else
1313
${DIST_DIR}/lang_server_windows.sh $@

‎dist/lang_server_linux.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
2-
DIST_DIR=$(dirname $(readlink -f "${BASH_SOURCE[0]}"))
2+
DIST_DIR=$(dirname $(readlink -f "$0"))
33
${DIST_DIR}/launch_linux.sh org.javacs.Main $@

‎dist/lang_server_mac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
2-
DIST_DIR=$(dirname $(readlink -f "${BASH_SOURCE[0]}"))
2+
DIST_DIR=$(dirname $(readlink -f "$0"))
33
${DIST_DIR}/launch_mac.sh org.javacs.Main $@

‎dist/lang_server_windows.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
2-
DIST_DIR=$(dirname $(readlink -f "${BASH_SOURCE[0]}"))
2+
DIST_DIR=$(dirname $(readlink -f "$0"))
33
${DIST_DIR}/launch_windows.sh org.javacs.Main $@

‎dist/launch_linux.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ JLINK_VM_OPTIONS="\
88
--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED \
99
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
1010
--add-opens jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"
11-
DIST_DIR=$(dirname $(readlink -f "${BASH_SOURCE[0]}"))
12-
CLASSPATH_OPTIONS="-classpath ${DIST_DIR}/classpath/gson-2.8.9.jar:${DIST_DIR}/classpath/protobuf-java-3.19.3.jar:${DIST_DIR}/classpath/java-language-server.jar"
11+
DIST_DIR=$(dirname $(readlink -f "$0"))
12+
CLASSPATH_JARS="$(find ${DIST_DIR}/classpath -type f -iname '*.jar'|xargs |sed 's/ /:/g')"
13+
CLASSPATH_OPTIONS="-classpath ${CLASSPATH_JARS}"
1314
${DIST_DIR}/linux/bin/java $JLINK_VM_OPTIONS $CLASSPATH_OPTIONS $@

‎dist/launch_mac.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ JLINK_VM_OPTIONS="\
88
--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED \
99
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
1010
--add-opens jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"
11-
DIST_DIR=$(dirname $(readlink -f "${BASH_SOURCE[0]}"))
12-
CLASSPATH_OPTIONS="-classpath ${DIST_DIR}/classpath/gson-2.8.9.jar:${DIST_DIR}/classpath/protobuf-java-3.19.3.jar:${DIST_DIR}/classpath/java-language-server.jar"
11+
DIST_DIR=$(dirname $(readlink -f "$0"))
12+
CLASSPATH_JARS="$(find ${DIST_DIR}/classpath -type f -iname '*.jar'|xargs |sed 's/ /:/g')"
13+
CLASSPATH_OPTIONS="-classpath ${CLASSPATH_JARS}"
1314
${DIST_DIR}/mac/bin/java $JLINK_VM_OPTIONS $CLASSPATH_OPTIONS $@

‎dist/launch_windows.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ JLINK_VM_OPTIONS="\
88
--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED \
99
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
1010
--add-opens jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"
11-
DIST_DIR=$(dirname $(readlink -f "${BASH_SOURCE[0]}"))
12-
CLASSPATH_OPTIONS="-classpath ${DIST_DIR}/classpath/gson-2.8.9.jar;${DIST_DIR}/classpath/protobuf-java-3.19.3.jar;${DIST_DIR}/classpath/java-language-server.jar"
11+
DIST_DIR=$(dirname $(readlink -f "$0"))
12+
CLASSPATH_JARS="$(find ${DIST_DIR}/classpath -type f -iname '*.jar'|xargs |sed 's/ /:/g')"
13+
CLASSPATH_OPTIONS="-classpath ${CLASSPATH_JARS}"
1314
${DIST_DIR}/windows/bin/java $JLINK_VM_OPTIONS $CLASSPATH_OPTIONS $@

0 commit comments

Comments
 (0)