diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-12-31 14:35:11 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-12-31 14:35:11 -0500 |
| commit | 99d6b1d0f1f88bf30b75243225cd461afb565f6b (patch) | |
| tree | 82a5239fce117f50bd4d80365cb21bd6e5efe409 /test/test.d/ftpdir-cleanup.sh | |
| parent | ffe9ada1c43d5fd779863c4be2782f7b690a5fbc (diff) | |
| parent | e6294556d3197b7d87f7659355d0e189fad613d6 (diff) | |
Merge branch 'cleanup' into master-merge
Conflicts:
config
cron-jobs/sourceballs
db-functions
db-move
db-remove
db-update
Diffstat (limited to 'test/test.d/ftpdir-cleanup.sh')
| -rwxr-xr-x | test/test.d/ftpdir-cleanup.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/test.d/ftpdir-cleanup.sh b/test/test.d/ftpdir-cleanup.sh index 20026b4..630b88f 100755 --- a/test/test.d/ftpdir-cleanup.sh +++ b/test/test.d/ftpdir-cleanup.sh @@ -4,7 +4,7 @@ curdir=$(readlink -e $(dirname $0)) . "${curdir}/../lib/common.inc" testCleanupSimplePackages() { - local arches=('i686' 'x86_64') + local arches=(`arches`) local pkgs=('pkg-simple-a' 'pkg-simple-b') local pkgbase local arch @@ -35,7 +35,7 @@ testCleanupSimplePackages() { } testCleanupEpochPackages() { - local arches=('i686' 'x86_64') + local arches=(`arches`) local pkgs=('pkg-simple-epoch') local pkgbase local arch @@ -85,7 +85,7 @@ testCleanupAnyPackages() { } testCleanupSplitPackages() { - local arches=('i686' 'x86_64') + local arches=(`arches`) local pkgs=('pkg-split-a' 'pkg-split-b') local pkg local pkgbase @@ -113,7 +113,7 @@ testCleanupSplitPackages() { done for pkg in "${pkgdir}/${pkgs[1]}"/*-${arch}${PKGEXT}; do - checkPackage extra $(basename ${pkg}) ${arch} + checkPackage extra ${pkg##*/} ${arch} done done } |