mirror of
https://github.com/s3fs-fuse/s3fs-fuse.git
synced 2024-12-23 09:18:55 +00:00
Initializing java package by update-alternatives
This commit is contained in:
parent
b428f68acf
commit
174d934d52
@ -5,6 +5,7 @@ cache: apt
|
||||
before_install:
|
||||
- sudo apt-get update -qq
|
||||
- sudo apt-get install -qq cppcheck libfuse-dev openjdk-7-jdk
|
||||
- sudo update-alternatives --auto java
|
||||
script:
|
||||
- ./autogen.sh
|
||||
- ./configure
|
||||
|
@ -99,15 +99,6 @@ function start_s3proxy {
|
||||
else
|
||||
S3PROXY_CONFIG="s3proxy.conf"
|
||||
fi
|
||||
JAVA_BIN=`which java`
|
||||
if [ $? -ne 0 ]; then
|
||||
if [ -f /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java ]; then
|
||||
JAVA_BIN=/usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java
|
||||
else
|
||||
# not found java command, so probabry gets error by stdbuf command line.
|
||||
JAVA_BIN=java
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -n "${S3PROXY_BINARY}" ]
|
||||
then
|
||||
@ -117,7 +108,7 @@ function start_s3proxy {
|
||||
chmod +x "${S3PROXY_BINARY}"
|
||||
fi
|
||||
|
||||
stdbuf -oL -eL ${JAVA_BIN} -jar "$S3PROXY_BINARY" --properties $S3PROXY_CONFIG | stdbuf -oL -eL sed -u "s/^/s3proxy: /" &
|
||||
stdbuf -oL -eL java -jar "$S3PROXY_BINARY" --properties $S3PROXY_CONFIG | stdbuf -oL -eL sed -u "s/^/s3proxy: /" &
|
||||
|
||||
# wait for S3Proxy to start
|
||||
for i in $(seq 30);
|
||||
|
Loading…
Reference in New Issue
Block a user