This is an automated email from the ASF dual-hosted git repository.
ivank pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 90a82c2 Explicitly search for bookkeeper-server jar
90a82c2 is described below
commit 90a82c278dab9c878e649d5aa8b0da9580287830
Author: Ivan Kelly <[email protected]>
AuthorDate: Tue Nov 28 09:45:21 2017 +0100
Explicitly search for bookkeeper-server jar
Rather than listing all jars, and excluding some exceptions, search for
jars which match a specific pattern, namely:
bookkeeper-server-[version].jar
Where [version] may include numbers, dots and optionally -SNAPSHOT.
Author: Ivan Kelly <[email protected]>
Reviewers: Enrico Olivelli <[email protected]>, Sijie Guo
<[email protected]>, Matteo Merli <[email protected]>
This closes #772 from ivankelly/fix-local-bookie
---
bookkeeper-server/bin/bookkeeper | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/bookkeeper-server/bin/bookkeeper b/bookkeeper-server/bin/bookkeeper
index a6a5806..f2b85fa 100755
--- a/bookkeeper-server/bin/bookkeeper
+++ b/bookkeeper-server/bin/bookkeeper
@@ -70,19 +70,28 @@ else
JAVA=$JAVA_HOME/bin/java
fi
-# exclude tests jar
-RELEASE_JAR=$(ls ${BK_HOME}/*bookkeeper-server-*.jar 2> /dev/null | grep -v
tests | tail -1)
+find-server-jar() {
+ DIR=$1
+ cd $DIR
+ for f in *.jar; do
+ if [[ $f =~ ^bookkeeper-server-[0-9\\.]*(-SNAPSHOT)?.jar$ ]]; then
+ echo $DIR/$f
+ return
+ fi
+ done
+}
+
+RELEASE_JAR=$(find-server-jar ${BK_HOME})
if [ -n "${RELEASE_JAR}" ]; then
BOOKIE_JAR=${RELEASE_JAR}
else
- RELEASE_JAR=$(ls ${BK_HOME}/lib/*bookkeeper-server-*.jar 2> /dev/null | grep
-v tests | tail -1)
+ RELEASE_JAR=$(find-server-jar ${BK_HOME}/lib)
if [ -n "${RELEASE_JAR}" ]; then
BOOKIE_JAR=${RELEASE_JAR}
fi
fi
-# exclude tests jar
-BUILT_JAR=$(ls ${BK_HOME}/target/*bookkeeper-server-*.jar 2> /dev/null | grep
-v tests | tail -1)
+BUILT_JAR=$(find-server-jar ${BK_HOME}/target)
if [ -z "${BUILT_JAR}" ] && [ -z "${BOOKIE_JAR}" ]; then
echo "Couldn't find bookkeeper jar."
@@ -96,7 +105,7 @@ if [ -z "${BUILT_JAR}" ] && [ -z "${BOOKIE_JAR}" ]; then
;;
esac
- BUILT_JAR=$(ls ${BK_HOME}/target/*bookkeeper-server-*.jar 2> /dev/null |
grep -v tests | tail -1)
+ BUILT_JAR=$(find-server-jar ${BK_HOME}/target)
if [ -n "${BUILT_JAR}" ]; then
BOOKIE_JAR=$BUILT_JAR
fi
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
