Skip to content

Commit a680d12

Browse files
author
Brennon York
committed
Added comments to functions and tested various mvn calls
1 parent bb8cc9d commit a680d12

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

build/mvn

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ install_app() {
3232
fi
3333
}
3434

35+
# Install maven under the build/ folder
3536
install_mvn() {
3637
install_app \
3738
"http://apache.claz.org/maven/maven-3/3.2.3/binaries" \
@@ -40,6 +41,7 @@ install_mvn() {
4041
MVN_BIN="${_DIR}/apache-maven-3.2.3/bin/mvn"
4142
}
4243

44+
# Install zinc under the build/ folder
4345
install_zinc() {
4446
ZINC_INSTALL_FLAG=1
4547
install_app \
@@ -49,6 +51,9 @@ install_zinc() {
4951
ZINC_BIN="${_DIR}/zinc-0.3.5.3/bin/zinc"
5052
}
5153

54+
# Determine the Scala version from the root pom.xml file, set the Scala URL,
55+
# and, with that, download the specific version of Scala necessary under
56+
# the build/ folder
5257
install_scala() {
5358
[ -z "`which python 2>/dev/null`" ] && \
5459
echo "ERROR: Found no `python` package; please install one and try again." && \
@@ -107,13 +112,8 @@ if [ -n "${ZINC_INSTALL_FLAG}" -o -z "`${ZINC_BIN} -status`" ]; then
107112
${ZINC_BIN} -shutdown
108113
${ZINC_BIN} -start -port ${ZINC_PORT} \
109114
-scala-compiler "${SCALA_COMPILER}" \
110-
-scala-library "${SCALA_LIBRARY}"
115+
-scala-library "${SCALA_LIBRARY}" &>/dev/null
111116
fi
112117

113-
# Determine the parameters pushed in from the command line and, if any are
114-
# present, use those within the maven
115-
if [ $# -gt 0 ]; then
116-
${MVN_BIN} "$@"
117-
else
118-
${MVN_BIN} clean package -DskipTests
119-
fi
118+
# Last, call the `mvn` command as usual
119+
${MVN_BIN} "$@"

0 commit comments

Comments
 (0)