summaryrefslogtreecommitdiffstats
path: root/test/test.d/pool-transition.sh
diff options
context:
space:
mode:
Diffstat (limited to 'test/test.d/pool-transition.sh')
-rwxr-xr-xtest/test.d/pool-transition.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/test.d/pool-transition.sh b/test/test.d/pool-transition.sh
index 5873f00..4912968 100755
--- a/test/test.d/pool-transition.sh
+++ b/test/test.d/pool-transition.sh
@@ -23,7 +23,7 @@ testMovePackagesWithoutPool() {
for arch in ${arches[@]}; do
for old in 0 2; do
for pkg in "${pkgdir}/${pkgs[${old}]}"/*-${arch}${PKGEXT}; do
- pkg=$(basename $pkg)
+ pkg=${pkg##*/}
mv -f "${FTP_BASE}/${PKGPOOL}/${pkg}" "${FTP_BASE}/testing/os/${arch}/${pkg}"
done
done
@@ -38,7 +38,7 @@ testMovePackagesWithoutPool() {
for pkgbase in ${pkgs[@]}; do
for arch in ${arches[@]}; do
for pkg in "${pkgdir}/${pkgbase}"/*-${arch}${PKGEXT}; do
- checkPackage extra $(basename ${pkg}) ${arch}
+ checkPackage extra ${pkg##*/} ${arch}
done
checkRemovedPackage testing ${pkgbase} ${arch}
done
@@ -95,7 +95,7 @@ testMoveAnyPackagesWithoutPool() {
# transform a package to old style layout
for pkg in "${pkgdir}/${pkgs[0]}"/*-any${PKGEXT}; do
- pkg=$(basename $pkg)
+ pkg=${pkg##*/}
mv -f "${FTP_BASE}/${PKGPOOL}/${pkg}" "${FTP_BASE}/testing/os/any/${pkg}"
for arch in i686 x86_64; do
ln -sf "../any/${pkg}" "${FTP_BASE}/testing/os/${arch}/${pkg}"
@@ -110,13 +110,13 @@ testMoveAnyPackagesWithoutPool() {
for pkgbase in ${pkgs[@]}; do
for pkg in "${pkgdir}/${pkgbase}"/*-any${PKGEXT}; do
- checkAnyPackage extra $(basename ${pkg})
+ checkAnyPackage extra ${pkg##*/}
done
checkRemovedAnyPackage testing ${pkgbase}
done
for pkg in "${pkgdir}/${pkgs[0]}"/*-any${PKGEXT}; do
- pkg=$(basename $pkg)
+ pkg=${pkg##*/}
for arch in any i686 x86_64; do
[ -f "${FTP_BASE}/testing/os/${arch}/${pkg}" ] && fail "testing/os/${arch}/${pkg} found"
done
@@ -132,7 +132,7 @@ testUpdateSameAnyPackageToDifferentRepositoriesWithoutPool() {
# transform a package to old style layout
for pkg in "${pkgdir}/pkg-any-a"/*-any${PKGEXT}; do
- pkg=$(basename $pkg)
+ pkg=${pkg##*/}
mv -f "${FTP_BASE}/${PKGPOOL}/${pkg}" "${FTP_BASE}/extra/os/any/${pkg}"
for arch in i686 x86_64; do
ln -sf "../any/${pkg}" "${FTP_BASE}/extra/os/${arch}/${pkg}"