luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7585 from invadergir/allow-spaces-in-build-properties 

Trim spaces around k and v to tolerate extra whitespace in build.properties
This commit is contained in:
eugene yokota 2024-08-08 02:22:06 -04:00 committed by GitHub
parent 2d3dacb46a b639331188
commit 2f936295f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sbt
View File

@ -89,6 +89,14 @@ cygwinpath() {
fi fi
} }
# Trim leading and trailing spaces from a string.
# Echos the new trimmed string.
trimString() {
local inputStr="$*"
local modStr="${inputStr#"${inputStr%%[![:space:]]*}"}"
modStr="${modStr%"${modStr##*[![:space:]]}"}"
echo "$modStr"
}
declare -r sbt_bin_dir="$(dirname "$(realpathish "$0")")" declare -r sbt_bin_dir="$(dirname "$(realpathish "$0")")"
declare -r sbt_home="$(dirname "$sbt_bin_dir")" declare -r sbt_home="$(dirname "$sbt_bin_dir")"
@ -707,6 +715,9 @@ loadConfigFile() {
} }
loadPropFile() { loadPropFile() {
# trim key and value so as to be more forgiving with spaces around the '=':
k=$(trimString $k)
v=$(trimString $v)
while IFS='=' read -r k v; do while IFS='=' read -r k v; do
if [[ "$k" == "sbt.version" ]]; then if [[ "$k" == "sbt.version" ]]; then
build_props_sbt_version="$v" build_props_sbt_version="$v"