Skip to content

Commit c065f1f

Browse files
committed
chore: try to fix scripts for CI
1 parent c961851 commit c065f1f

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

.travis/install_libzookeeper.sh

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,19 @@
33
LIBZOOKEEPER_VERSION=$1
44
LIBZOOKEEPER_MAJOR_VERSION=`echo ${LIBZOOKEEPER_VERSION} | awk -F'.' '{print $1}'`
55
LIBZOOKEEPER_MINOR_VERSION=`echo ${LIBZOOKEEPER_VERSION} | awk -F'.' '{print $2}'`
6+
LIBZOOKEEPER_PATCH_VERSION=`echo ${LIBZOOKEEPER_VERSION} | awk -F'.' '{print $3}'`
67

7-
PACKAGE_NAME=zookeeper-${LIBZOOKEEPER_VERSION}
8-
LIBZOOKEEPER_PREFIX=${HOME}/lib${PACKAGE_NAME}
8+
if [ ${LIBZOOKEEPER_MAJOR_VERSION} -ge 3 -a ${LIBZOOKEEPER_MINOR_VERSION} -ge 5 -a ${LIBZOOKEEPER_PATCH_VERSION} -ge 5 ]; then
9+
PACKAGE_NAME=apache-zookeeper-${LIBZOOKEEPER_VERSION}
10+
else
11+
PACKAGE_NAME=zookeeper-${LIBZOOKEEPER_VERSION}
12+
fi
13+
URL_DIR_NAME=zookeeper-${LIBZOOKEEPER_VERSION}
14+
LIBZOOKEEPER_PREFIX=${HOME}/lib${URL_DIR_NAME}
915

1016
TRAVIS_SCRIPT_DIR=$(cd $(dirname $0); pwd)
1117

12-
wget http://apache.mirrors.lucidnetworks.net/zookeeper/${PACKAGE_NAME}/${PACKAGE_NAME}.tar.gz || exit 1
18+
wget http://apache.mirrors.lucidnetworks.net/zookeeper/${URL_DIR_NAME}/${PACKAGE_NAME}.tar.gz || exit 1
1319
tar xvf ${PACKAGE_NAME}.tar.gz || exit 1
1420

1521
if [ ${LIBZOOKEEPER_MAJOR_VERSION} -ge 3 -a ${LIBZOOKEEPER_MINOR_VERSION} -ge 5 ]; then
@@ -22,7 +28,12 @@ else
2228
${PACKAGE_NAME}/bin/zkServer.sh start
2329
fi
2430

25-
cd ${PACKAGE_NAME}/src/c
31+
if [ ${LIBZOOKEEPER_MAJOR_VERSION} -ge 3 -a ${LIBZOOKEEPER_MINOR_VERSION} -ge 5 -a ${LIBZOOKEEPER_PATCH_VERSION} -ge 5 ]; then
32+
cd ${PACKAGE_NAME}/zookeeper-client/zookeeper-client-c
33+
autoreconf -if
34+
else
35+
cd ${PACKAGE_NAME}/src/c
36+
fi
2637
./configure --prefix=${LIBZOOKEEPER_PREFIX} || exit 1
2738
make || exit 1
2839
make install || exit 1

0 commit comments

Comments
 (0)