gradle: adopt _bash_it_find_in_ancestor()
This commit is contained in:
@@ -22,17 +22,9 @@
|
||||
# Avoid inaccurate completions for subproject tasks
|
||||
COMP_WORDBREAKS=$(echo "$COMP_WORDBREAKS" | sed -e 's/://g')
|
||||
|
||||
__gradle-set-project-root-dir() {
|
||||
local dir="${PWD}"
|
||||
project_root_dir="${PWD}"
|
||||
while [[ $dir != '/' ]]; do
|
||||
if [[ -f "$dir/settings.gradle" || -f "$dir/gradlew" ]]; then
|
||||
project_root_dir=$dir
|
||||
return 0
|
||||
fi
|
||||
dir="$(dirname "$dir")"
|
||||
done
|
||||
return 1
|
||||
function __gradle-set-project-root-dir() {
|
||||
project_root_dir="$(_bash-it-find-in-ancestor "settings.gradle" "gradlew")"
|
||||
return "$?"
|
||||
}
|
||||
|
||||
__gradle-init-cache-dir() {
|
||||
|
||||
@@ -3,19 +3,10 @@ about-plugin 'Add a gw command to use gradle wrapper if present, else use system
|
||||
|
||||
function gw() {
|
||||
local file="gradlew"
|
||||
local curr_path="${PWD}"
|
||||
local result="gradle"
|
||||
local result
|
||||
|
||||
# Search recursively upwards for file.
|
||||
until [[ "${curr_path}" == "/" ]]; do
|
||||
if [[ -e "${curr_path}/${file}" ]]; then
|
||||
result="${curr_path}/${file}"
|
||||
break
|
||||
else
|
||||
curr_path=$(dirname "${curr_path}")
|
||||
fi
|
||||
done
|
||||
result="$(_bash-it-find-in-ancestor "${file}")"
|
||||
|
||||
# Call gradle
|
||||
"${result}" $*
|
||||
"${result:-gradle}" $*
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user