pmodules/Pmodules
2
0
Fork 0
mirror of https://github.com/Pmodules/Pmodules.git synced 2026-08-08 04:12:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '228-modbuild-better-version-compare-functions' into 'master'

Browse Source 
Resolve "modbuild: better version compare functions"

Closes #228

See merge request Pmodules/src!205
This commit is contained in:
gsell
2023-08-04 14:17:17 +02:00
parent 9922aeede1 8103e5668e
commit 5202fc6c8a
1 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pmodules/libpbuild.bash
+32 -4
View File
@@ -259,14 +259,28 @@ pbuild::version_lt() {
readonly -f pbuild::version_lt readonly -f pbuild::version_lt
pbuild::version_le() { pbuild::version_le() {
pbuild::version_compare "$1" "$2" if (( $# == 1 )); then
local vers1="${V_PKG}"
local vers2="$1"
else
local vers1="$1"
local vers2="$2"
fi
pbuild::version_compare "${vers1}" "${vers2}"
local -i exit_code=$? local -i exit_code=$?
(( exit_code == 0 || exit_code == 2 )) (( exit_code == 0 || exit_code == 2 ))
} }
readonly -f pbuild::version_le readonly -f pbuild::version_le
pbuild::version_gt() { pbuild::version_gt() {
pbuild::version_compare "$1" "$2" if (( $# == 1 )); then
local vers1="${V_PKG}"
local vers2="$1"
else
local vers1="$1"
local vers2="$2"
fi
pbuild::version_compare "${vers1}" "${vers2}"
(( $? == 1 )) (( $? == 1 ))
local -i exit_code=$? local -i exit_code=$?
(( exit_code == 1 )) (( exit_code == 1 ))
@@ -274,7 +288,14 @@ pbuild::version_gt() {
readonly -f pbuild::version_gt readonly -f pbuild::version_gt
pbuild::version_ge() { pbuild::version_ge() {
pbuild::version_compare "$1" "$2" if (( $# == 1 )); then
local vers1="${V_PKG}"
local vers2="$1"
else
local vers1="$1"
local vers2="$2"
fi
pbuild::version_compare "${vers1}" "${vers2}"
(( $? == 1 )) (( $? == 1 ))
local -i exit_code=$? local -i exit_code=$?
(( exit_code == 0 || exit_code == 1 )) (( exit_code == 0 || exit_code == 1 ))
@@ -282,7 +303,14 @@ pbuild::version_ge() {
readonly -f pbuild::version_gt readonly -f pbuild::version_gt
pbuild::version_eq() { pbuild::version_eq() {
pbuild::version_compare "$1" "$2" if (( $# == 1 )); then
local vers1="${V_PKG}"
local vers2="$1"
else
local vers1="$1"
local vers2="$2"
fi
pbuild::version_compare "${vers1}" "${vers2}"
} }
readonly -f pbuild::version_eq readonly -f pbuild::version_eq