Skip to content

Commit 5281c88

Browse files
committed
install.sh: introduce Java existance check
Since we dropped Java check from unified installer and jmx, we need to do it on scylla-tools. Related scylladb/scylladb#17969
1 parent 01ba3c1 commit 5281c88

File tree

1 file changed

+24
-0
lines changed

1 file changed

+24
-0
lines changed

install.sh

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Options:
3131
--prefix /prefix directory prefix (default /usr)
3232
--etcdir /etc specify etc directory path (default /etc)
3333
--nonroot install Scylla without required root priviledge
34+
--packaging use install.sh for packaging
3435
--help this helpful message
3536
EOF
3637
exit 1
@@ -39,6 +40,7 @@ EOF
3940
root=/
4041
etcdir=/etc
4142
nonroot=false
43+
packaging=false
4244

4345
while [ $# -gt 0 ]; do
4446
case "$1" in
@@ -58,6 +60,10 @@ while [ $# -gt 0 ]; do
5860
nonroot=true
5961
shift 1
6062
;;
63+
"--packaging")
64+
packaging=true
65+
shift 1
66+
;;
6167
"--help")
6268
shift 1
6369
print_usage
@@ -68,6 +74,24 @@ while [ $# -gt 0 ]; do
6874
esac
6975
done
7076

77+
if ! $packaging; then
78+
if [ -n "$JAVA_HOME" ]; then
79+
for java in "$JAVA_HOME"/bin/amd64/java "$JAVA_HOME"/bin/java; do
80+
if [ -x "$java" ]; then
81+
JAVA="$java"
82+
break
83+
fi
84+
done
85+
else
86+
JAVA=java
87+
fi
88+
89+
if ! builtin command -v $JAVA > /dev/null; then
90+
echo "Please install openjdk-11 before running install.sh."
91+
exit 1
92+
fi
93+
fi
94+
7195
if [ -z "$prefix" ]; then
7296
if $nonroot; then
7397
prefix=~/scylladb

0 commit comments

Comments
 (0)