octoleo/octojpack
3
3
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update version to 1.3.8 and improve XML version extraction logic.

Browse Source 
Bump the program version number to 1.3.8. Refine the _xml_version function to handle case-insensitive checks for <extension> tags and ensure correct version extraction with enhanced depth evaluation for XML files. Simplify folder depth calculation and improve robustness of the logic.
This commit is contained in:
Llewellyn van der Merwe
2025-06-26 01:03:12 +02:00
parent f480b6f1f3
commit 54227596c2
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/octojpack
View File

@ -3,7 +3,7 @@
# Program name # Program name
PROGRAM_NAME="Octojpack" PROGRAM_NAME="Octojpack"
PROGRAM_CODE="octojpack" PROGRAM_CODE="octojpack"
PROGRAM_VERSION="1.3.7" PROGRAM_VERSION="1.3.8"
PROGRAM_V="1.3" PROGRAM_V="1.3"
PROGRAM_URL="https://git.vdm.dev/octoleo/${PROGRAM_CODE}" PROGRAM_URL="https://git.vdm.dev/octoleo/${PROGRAM_CODE}"
@ -1181,7 +1181,7 @@ function getUniqueFileName() {
echo "${hash:0:10}" echo "${hash:0:10}"
} }
# get the version from the current directory # Get the version from the current directory
function _xml_version() { function _xml_version() {
local version="" local version=""
local shortest_depth=100 local shortest_depth=100
@ -1196,22 +1196,31 @@ function _xml_version() {
*config.xml|*access.xml|*default.xml) continue ;; *config.xml|*access.xml|*default.xml) continue ;;
esac esac
# Ensure it's an extension XML and not an update XML # Ensure it's an extension XML (check if it has a <extension> root tag anywhere)
grep -q '<extension' "$file" || continue if ! grep -iq '^[[:space:]]*<extension[[:space:]>]' "$file"; then
continue
# Extract version if present in XML
v=$(sed -n 's|.*<version>\([^<]*\)</version>.*|\1|p' "$file")
# Determine folder depth (count slashes)
depth=$(awk -F'/' '{print NF}' <<< "$file")
# Choose the file with the shortest path (highest in folder stack)
if [[ -n "$v" && "$depth" -lt "$shortest_depth" ]]; then
shortest_depth="$depth"
version="$v"
fi fi
done < <(find . -type f -name '*.xml') # Extract version if present in XML
v=$(sed -n 's|.*<version>\(.*\)</version>.*|\1|p' "$file" | head -n1)
# Skip if no version found
[[ -z "$v" ]] && continue
# Determine folder depth (count slashes)
depth=$(tr -cd '/' <<< "$file" | wc -c)
# Choose the file with the shortest path (highest in folder stack)
if (( depth < shortest_depth )); then
shortest_depth=$depth
version=$v
# Since we want the highest-up file, and this is the shallowest so far,
# we can break early if it's at root level (depth 1)
(( depth <= 1 )) && break
fi
done < <(find . -type f -iname '*.xml')
# Return failure if no version is found # Return failure if no version is found
if [[ -z "$version" ]]; then if [[ -z "$version" ]]; then