Skip to content

Commit 402fbad

Browse files
authored
#1391: avoid files like dependencies.json are considered as version (#1392)
1 parent 15e75c0 commit 402fbad

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

Diff for: .gitattributes

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
* eol=lf
22
*.bat eol=crlf
3-
*.png -text
3+
*.jar binary
4+
*.png binary
5+
*.jpg binary

Diff for: scripts/src/main/resources/scripts/functions

+4-4
Original file line numberDiff line numberDiff line change
@@ -1904,11 +1904,11 @@ function doGetAnyLatestSoftwareVersion() {
19041904
edition=$(doGetSoftwareEdition "${software}")
19051905
if [ -z "${prefix}" ]
19061906
then
1907-
version="$(find "${DEVON_IDE_HOME}"/urls/"${software}"/"${edition}" -mindepth 1 -maxdepth 1 -print | awk -F'/' '{print $NF}' | sort -rV | head -1)"
1907+
version="$(find "${DEVON_IDE_HOME}"/urls/"${software}"/"${edition}" -type d -mindepth 1 -maxdepth 1 -print | awk -F'/' '{print $NF}' | sort -rV | head -1)"
19081908
else
19091909
prefix="${prefix:0:${#prefix}-2}" # 2 for "*!"
19101910
prefix="${prefix/./[.]}"
1911-
version="$(find "${DEVON_IDE_HOME}"/urls/"${software}"/"${edition}" -mindepth 1 -maxdepth 1 -print | awk -F'/' '{print $NF}' | grep "^${prefix}" | sort -rV | head -1)"
1911+
version="$(find "${DEVON_IDE_HOME}"/urls/"${software}"/"${edition}" -type d -mindepth 1 -maxdepth 1 -print | awk -F'/' '{print $NF}' | grep "^${prefix}" | sort -rV | head -1)"
19121912
fi
19131913
echo "${version}"
19141914
}
@@ -1926,14 +1926,14 @@ function doGetLatestSoftwareVersion() {
19261926
versions=()
19271927
while IFS= read -r line; do
19281928
versions+=("${line}")
1929-
done < <(find "${DEVON_IDE_HOME}"/urls/"${software}"/"${edition}" -mindepth 1 -maxdepth 1 -print | awk -F'/' '{print $NF}' | sort -rV)
1929+
done < <(find "${DEVON_IDE_HOME}"/urls/"${software}"/"${edition}" -type d -mindepth 1 -maxdepth 1 -print | awk -F'/' '{print $NF}' | sort -rV)
19301930
else
19311931
prefix="${prefix:0:${#prefix}-1}" # 1 for "*"
19321932
prefix="${prefix/./[.]}"
19331933
versions=()
19341934
while IFS= read -r line; do
19351935
versions+=("${line}")
1936-
done < <(find "${DEVON_IDE_HOME}"/urls/"${software}"/"${edition}" -mindepth 1 -maxdepth 1 -print | awk -F'/' '{print $NF}' | grep "^${prefix}" | sort -rV)
1936+
done < <(find "${DEVON_IDE_HOME}"/urls/"${software}"/"${edition}" -type d -mindepth 1 -maxdepth 1 -print | awk -F'/' '{print $NF}' | grep "^${prefix}" | sort -rV)
19371937
fi
19381938

19391939
# version is not considered stable (see IDEasy VersionSegment) if:

0 commit comments

Comments
 (0)