Skip to content
Snippets Groups Projects
Commit 3b4c88ff authored by Natanael Copa's avatar Natanael Copa
Browse files

buildrepo: fix clean of old pkgs

- we need check arch for noarch
- we need list packages generated from $linguas
parent cf102231
No related branches found
No related tags found
No related merge requests found
...@@ -31,9 +31,22 @@ usage() { ...@@ -31,9 +31,22 @@ usage() {
exit 1 exit 1
} }
is_in() {
local needle="$1" arg=
shift
for arg; do
[ "$needle" = "$arg" ] && return 0
done
return 1
}
check_arch() {
[ "$1" = "all" ] || [ "$1" = "noarch" ] || is_in "$CARCH" $@
}
listpackages() { listpackages() {
local repo="$1" i= pkgname= pkgver= pkgrel= subpackage= arch= subpkg= local repo="$1" i= pkgname= pkgver= pkgrel= subpackage= arch= subpkg= linguas=
local lang= suffix=
cd "$aportsdir/$repo" cd "$aportsdir/$repo"
for i in */APKBUILD; do for i in */APKBUILD; do
cd "$aportsdir/$repo"/${i%/*} || return 1 cd "$aportsdir/$repo"/${i%/*} || return 1
...@@ -42,12 +55,18 @@ listpackages() { ...@@ -42,12 +55,18 @@ listpackages() {
pkgrel= pkgrel=
subpackages= subpackages=
arch= arch=
linguas=
. ./APKBUILD . ./APKBUILD
if ! is_in all $arch && ! is_in "$CARCH" $arch; then suffix="$pkgver-r$pkgrel.apk"
if ! check_arch $arch; then
continue continue
fi fi
for subpkg in $pkgname $subpackages; do for subpkg in $pkgname $subpackages; do
echo ${subpkg%:*}-$pkgver-r$pkgrel.apk echo ${subpkg%:*}-$suffix
done
for lang in $linguas; do
echo $pkgname-lang-$lang-$suffix
done done
done done
} }
...@@ -60,16 +79,6 @@ all_exist() { ...@@ -60,16 +79,6 @@ all_exist() {
return 0 return 0
} }
is_in() {
local needle="$1"
shift
while [ $# -gt 0 ]; do
[ "$needle" = "$1" ] && return 0
shift
done
return 1
}
list_needbuild() { list_needbuild() {
local repo="$1" i= local repo="$1" i=
...@@ -89,7 +98,7 @@ list_needbuild() { ...@@ -89,7 +98,7 @@ list_needbuild() {
arch= arch=
. ./APKBUILD . ./APKBUILD
if ! is_in all $arch && ! is_in $CARCH $arch; then if ! check_arch $arch; then
continue continue
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment