diff options
Diffstat (limited to 'share/db-functions')
| -rw-r--r-- | share/db-functions | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/share/db-functions b/share/db-functions index 9afb9e2..ac7e6ef 100644 --- a/share/db-functions +++ b/share/db-functions @@ -338,7 +338,7 @@ check_pkgfile() { local pkgarch="$(getpkgarch "${pkgfile}")" [ $? -ge 1 ] && return 1 - in_array "${pkgarch}" "${ARCHES[@]}" 'any' || return 1 + in_array "${pkgarch}" "${architectures[@]}" 'any' || return 1 if echo "${pkgfile##*/}" | grep -q "${pkgname}-${pkgver}-${pkgarch}"; then return 0 @@ -359,7 +359,7 @@ check_pkgxbs() { [ $? -ge 1 ] && return 1 local repo="${2}" - in_array "${repo}" "${PKGREPOS[@]}" || return 1 + in_array "${repo}" "${repositories[@]}" || return 1 local xbsver="$(. "$(xbs releasepath "${_pkgbase}" "${repo}" "${_pkgarch}")/PKGBUILD"; get_full_version "${_pkgname}")" [ "${xbsver}" == "${_pkgver}" ] || return 1 @@ -417,15 +417,15 @@ check_pkgrepos() { local pkgarch="$(getpkgarch "${pkgfile}")" [ $? -ge 1 ] && return 1 - [ -f "${root_dir}/${PKGPOOL}/${pkgname}-${pkgver}-${pkgarch}"${package_extension_suffixfile} ] && return 1 - [ -f "${root_dir}/${PKGPOOL}/${pkgname}-${pkgver}-${pkgarch}"${package_extension_suffixfile}.sig ] && return 1 - [ -f "${root_dir}/${PKGPOOL}/${pkgfile##*/}" ] && return 1 - [ -f "${root_dir}/${PKGPOOL}/${pkgfile##*/}.sig" ] && return 1 + [ -f "${root_dir}/${packages_pool}/${pkgname}-${pkgver}-${pkgarch}"${package_extension_suffixfile} ] && return 1 + [ -f "${root_dir}/${packages_pool}/${pkgname}-${pkgver}-${pkgarch}"${package_extension_suffixfile}.sig ] && return 1 + [ -f "${root_dir}/${packages_pool}/${pkgfile##*/}" ] && return 1 + [ -f "${root_dir}/${packages_pool}/${pkgfile##*/}.sig" ] && return 1 local repo local arch - for repo in "${PKGREPOS[@]}"; do - for arch in "${ARCHES[@]}"; do + for repo in "${repositories[@]}"; do + for arch in "${architectures[@]}"; do [ -f "${root_dir}/${repo}/os/${arch}/${pkgname}-${pkgver}-${pkgarch}"${package_extension_suffixfile} ] && return 1 [ -f "${root_dir}/${repo}/os/${arch}/${pkgname}-${pkgver}-${pkgarch}"${package_extension_suffixfile}.sig ] && return 1 [ -f "${root_dir}/${repo}/os/${arch}/${pkgfile##*/}" ] && return 1 @@ -449,15 +449,15 @@ chk_license() { check_repo_permission() { local repo=$1 - [ ${#PKGREPOS[@]} -eq 0 ] && return 1 - [ -z "${PKGPOOL}" ] && return 1 + [ ${#repositories[@]} -eq 0 ] && return 1 + [ -z "${packages_pool}" ] && return 1 - in_array "${repo}" "${PKGREPOS[@]}" || return 1 + in_array "${repo}" "${repositories[@]}" || return 1 - [ -w "${root_dir}/${PKGPOOL}" ] || return 1 + [ -w "${root_dir}/${packages_pool}" ] || return 1 local arch - for arch in "${ARCHES[@]}"; do + for arch in "${architectures[@]}"; do local dir="${root_dir}/${repo}/os/${arch}/" [ -w "${dir}" ] || return 1 [ -f "${dir}${repo}"${database_extension_suffixfile} -a ! -w "${dir}${repo}"${database_extension_suffixfile} ] && return 1 |