Skip to content

Commit 8a5267b

Browse files
committed
refactor java_build_utils.sh: prefix inner var with _; add FIXME comments
1 parent 0313cd6 commit 8a5267b

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

lib/java_build_utils.sh

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jvb::get_java_version() {
3434
"$java_home_path/bin/java" -version 2>&1 | awk -F\" '/ version "/{print $2}'
3535
}
3636

37+
# FIXME hard code memery settings
3738
# shellcheck disable=SC2034
3839
readonly JVB_DEFAULT_JAVA_OPTS=(
3940
-Xmx256m -Xms256m
@@ -65,27 +66,27 @@ readonly JVB_DEFAULT_MVN_OPTS=(
6566
)
6667

6768
jvb::_find_mvn_cmd_path() {
68-
if [ -n "${JVB_MVN_PATH:-}" ]; then
69-
echo "$JVB_MVN_PATH"
69+
if [ -n "${_JVB_MVN_PATH:-}" ]; then
70+
echo "$_JVB_MVN_PATH"
7071
return
7172
fi
7273

7374
local -r maven_wrapper_name="mvnw"
7475

7576
# 1. find the mvnw from project root dir
7677
if [ -n "${PROJECT_ROOT_DIR:-}" ] && [ -e "$PROJECT_ROOT_DIR/$maven_wrapper_name" ]; then
77-
JVB_MVN_PATH="$PROJECT_ROOT_DIR/$maven_wrapper_name"
78-
echo "$JVB_MVN_PATH"
78+
_JVB_MVN_PATH="$PROJECT_ROOT_DIR/$maven_wrapper_name"
79+
echo "$_JVB_MVN_PATH"
7980
return
8081
fi
8182

8283
# 2. find mvnw from parent dirs
8384
local d="$PWD"
8485
while true; do
8586
local mvnw_path="$d/$maven_wrapper_name"
86-
[ -f "$mvnw_path" ] && {
87-
JVB_MVN_PATH="$mvnw_path"
88-
echo "$JVB_MVN_PATH"
87+
[ -x "$mvnw_path" ] && {
88+
_JVB_MVN_PATH="$mvnw_path"
89+
echo "$_JVB_MVN_PATH"
8990
return
9091
}
9192

@@ -95,8 +96,8 @@ jvb::_find_mvn_cmd_path() {
9596

9697
# 3. find mvn from $PATH
9798
if command -v mvn &>/dev/null; then
98-
JVB_MVN_PATH=mvn
99-
echo "$JVB_MVN_PATH"
99+
_JVB_MVN_PATH=mvn
100+
echo "$_JVB_MVN_PATH"
100101
return
101102
fi
102103

@@ -112,6 +113,7 @@ jvb::_find_mvn_cmd_path() {
112113
jvb::mvn_cmd() {
113114
(($# > 0)) || cu::die "${FUNCNAME[0]} requires arguments! But no provided"
114115

116+
# FIXME hard code logic for `DISABLE_GIT_DIRTY_CHECK`
115117
cu::log_then_run "$(jvb::_find_mvn_cmd_path)" \
116118
"${JVB_MVN_OPTS[@]}" \
117119
${DISABLE_GIT_DIRTY_CHECK+-Dgit.dirty=false} \
@@ -121,16 +123,16 @@ jvb::mvn_cmd() {
121123
jvb::get_mvn_local_repository_dir() {
122124
(($# == 0)) || cu::die "${FUNCNAME[0]} requires no arguments! But provided $#: $*"
123125

124-
if [ -z "${JVB_MVN_LOCAL_REPOSITORY_DIR:-}" ]; then
125-
echo "$JVB_MVN_LOCAL_REPOSITORY_DIR"
126+
if [ -z "${_JVB_MVN_LOCAL_REPOSITORY_DIR:-}" ]; then
127+
echo "$_JVB_MVN_LOCAL_REPOSITORY_DIR"
126128
fi
127129

128-
JVB_MVN_LOCAL_REPOSITORY_DIR="$(
130+
_JVB_MVN_LOCAL_REPOSITORY_DIR="$(
129131
jvb::mvn_cmd --no-transfer-progress help:evaluate -Dexpression=settings.localRepository |
130132
grep '^/'
131133
)"
132134

133-
[ -n "${JVB_MVN_LOCAL_REPOSITORY_DIR:-}" ] || die "Fail to find maven local repository directory"
135+
[ -n "${_JVB_MVN_LOCAL_REPOSITORY_DIR:-}" ] || die "Fail to find maven local repository directory"
134136
}
135137

136138
################################################################################

0 commit comments

Comments
 (0)