These functions group in with other functions that extract PKGBUILD information. Signed-off-by: Allan McRae <allan@archlinux.org> --- scripts/libmakepkg/util/pkgbuild.sh | 35 +++++++++++++++++++++++++++++++++++ scripts/makepkg.sh.in | 35 ----------------------------------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/scripts/libmakepkg/util/pkgbuild.sh b/scripts/libmakepkg/util/pkgbuild.sh index 2e97e4d..17e4cc5 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh +++ b/scripts/libmakepkg/util/pkgbuild.sh @@ -109,3 +109,38 @@ get_pkgbuild_attribute() { extract_global_variable "$attrname" "$isarray" "$outputvar" fi } + +## +# usage : get_full_version() +# return : full version spec, including epoch (if necessary), pkgver, pkgrel +## +get_full_version() { + if (( epoch > 0 )); then + printf "%s\n" "$epoch:$pkgver-$pkgrel" + else + printf "%s\n" "$pkgver-$pkgrel" + fi +} + +## +# usage : get_pkg_arch( [$pkgname] ) +# return : architecture of the package +## +get_pkg_arch() { + if [[ -z $1 ]]; then + if [[ $arch = "any" ]]; then + printf "%s\n" "any" + else + printf "%s\n" "$CARCH" + fi + else + local arch_override + get_pkgbuild_attribute "$1" arch 1 arch_override + (( ${#arch_override[@]} == 0 )) && arch_override=("${arch[@]}") + if [[ $arch_override = "any" ]]; then + printf "%s\n" "any" + else + printf "%s\n" "$CARCH" + fi + fi +} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 11e6459..2d64997 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -854,41 +854,6 @@ missing_source_file() { exit 1 # $E_MISSING_FILE } -## -# usage : get_full_version() -# return : full version spec, including epoch (if necessary), pkgver, pkgrel -## -get_full_version() { - if (( epoch > 0 )); then - printf "%s\n" "$epoch:$pkgver-$pkgrel" - else - printf "%s\n" "$pkgver-$pkgrel" - fi -} - -## -# usage : get_pkg_arch( [$pkgname] ) -# return : architecture of the package -## -get_pkg_arch() { - if [[ -z $1 ]]; then - if [[ $arch = "any" ]]; then - printf "%s\n" "any" - else - printf "%s\n" "$CARCH" - fi - else - local arch_override - get_pkgbuild_attribute "$1" arch 1 arch_override - (( ${#arch_override[@]} == 0 )) && arch_override=("${arch[@]}") - if [[ $arch_override = "any" ]]; then - printf "%s\n" "any" - else - printf "%s\n" "$CARCH" - fi - fi -} - source_has_signatures() { local file all_sources -- 2.4.0