#1391: avoid files like dependencies.json are considered as version (#…

…1392)
devonfw · Nov 12, 2024 · 402fbad · 402fbad
1 parent 15e75c0
commit 402fbad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,5 @@
 * eol=lf
 *.bat eol=crlf
-*.png -text
+*.jar binary
+*.png binary
+*.jpg binary
diff --git a/scripts/src/main/resources/scripts/functions b/scripts/src/main/resources/scripts/functions
@@ -1904,11 +1904,11 @@ function doGetAnyLatestSoftwareVersion() {
   edition=$(doGetSoftwareEdition "${software}")
   if [ -z "${prefix}" ]
   then
-    version="$(find "${DEVON_IDE_HOME}"/urls/"${software}"/"${edition}" -mindepth 1 -maxdepth 1 -print | awk -F'/' '{print $NF}' | sort -rV | head -1)"
+    version="$(find "${DEVON_IDE_HOME}"/urls/"${software}"/"${edition}" -type d -mindepth 1 -maxdepth 1 -print | awk -F'/' '{print $NF}' | sort -rV | head -1)"
   else
     prefix="${prefix:0:${#prefix}-2}" # 2 for "*!"
     prefix="${prefix/./[.]}"
-    version="$(find "${DEVON_IDE_HOME}"/urls/"${software}"/"${edition}" -mindepth 1 -maxdepth 1 -print | awk -F'/' '{print $NF}' | grep "^${prefix}" | sort -rV | head -1)"
+    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)"
   fi
   echo "${version}"
 }
@@ -1926,14 +1926,14 @@ function doGetLatestSoftwareVersion() {
     versions=()
     while IFS= read -r line; do
       versions+=("${line}")
-    done < <(find "${DEVON_IDE_HOME}"/urls/"${software}"/"${edition}" -mindepth 1 -maxdepth 1 -print | awk -F'/' '{print $NF}' | sort -rV)
+    done < <(find "${DEVON_IDE_HOME}"/urls/"${software}"/"${edition}" -type d -mindepth 1 -maxdepth 1 -print | awk -F'/' '{print $NF}' | sort -rV)
   else
     prefix="${prefix:0:${#prefix}-1}" # 1 for "*"
     prefix="${prefix/./[.]}"
     versions=()
     while IFS= read -r line; do
       versions+=("${line}")
-    done < <(find "${DEVON_IDE_HOME}"/urls/"${software}"/"${edition}" -mindepth 1 -maxdepth 1 -print | awk -F'/' '{print $NF}' | grep "^${prefix}" | sort -rV)
+    done < <(find "${DEVON_IDE_HOME}"/urls/"${software}"/"${edition}" -type d -mindepth 1 -maxdepth 1 -print | awk -F'/' '{print $NF}' | grep "^${prefix}" | sort -rV)
   fi
 
   # version is not considered stable (see IDEasy VersionSegment) if: