summaryrefslogtreecommitdiff
path: root/src/fullpkg/fullpkg-find
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-06-02 15:12:59 -0600
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-06-05 20:01:06 -0600
commit12da94c924cb29dd83c4bbf6fd50d1d1fc660312 (patch)
tree11d72d386908df40bce89265403f9ad249da0230 /src/fullpkg/fullpkg-find
parent24073402dd3d4324f117f12abc3c921cc3dc3750 (diff)
use common.sh:get_full_version() universally
Diffstat (limited to 'src/fullpkg/fullpkg-find')
-rwxr-xr-xsrc/fullpkg/fullpkg-find17
1 files changed, 2 insertions, 15 deletions
diff --git a/src/fullpkg/fullpkg-find b/src/fullpkg/fullpkg-find
index dbe65df..72a6585 100755
--- a/src/fullpkg/fullpkg-find
+++ b/src/fullpkg/fullpkg-find
@@ -11,18 +11,6 @@ guess_repo() {
basename $(dirname $(pwd))
}
-# return : full version spec, including epoch (if necessary), pkgver, pkgrel
-# usage : get_fullver( ${epoch:-0}, $pkgver, $pkgrel )
-get_fullver() {
- if [[ $1 -eq 0 ]]; then
-# zero epoch case, don't include it in version
- echo $2-$3
- else
- echo $1:$2-$3
- fi
-
-}
-
copy_files() {
local copydir="$build_dir/${pkgbase:-${pkgname[0]}}"
@@ -60,7 +48,6 @@ find_deps() {
local repo="${repo:-$(guess_repo)}"
local pkgbase="${pkgbase:-${pkgname[0]}}"
- local fullver="$(get_fullver ${epoch:-0} ${pkgver} ${pkgrel})"
if ! pkgbuild-check-nonfree > /dev/null 2> /dev/null; then
if [ "$?" -eq 15 ]; then
@@ -73,7 +60,7 @@ find_deps() {
# be always considered outdated: there is no package built named kdebase.
# TODO: maybe check for the package requested in case of recursive calls,
# instead of the first one listed?
- if is_built "${pkgname[0]}" "${fullver}"; then
+ if is_built "${pkgname[0]}" "$(get_full_version "${pkgname[0]}")"; then
exit 0 # pkg is built and updated
fi
@@ -91,7 +78,7 @@ find_deps() {
fi
# current package plus a space for every level
- msg2 "%${LEVEL}s${pkgbase}-${fullver}"
+ msg2 "%${LEVEL}s${pkgbase}-$(get_full_version)"
## Check next levels
declare -i next_level=$LEVEL+1