summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-01-08 20:49:48 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-01-08 21:27:09 -0500
commitd3afe9bb766bbdfaab1474d21fd5e28f0a356039 (patch)
treefbbd414f8526b5ae053fc708cd6844dbfadd3ecb
parentaefd5a4d961e3eca3326c90ba266d04b325c1f15 (diff)
Avoid using $(basename $var) , use ${var##*/} instead
-rwxr-xr-xabslibre2
-rwxr-xr-xcron-jobs/ftpdir-cleanup2
-rw-r--r--db-functions10
-rwxr-xr-xdb-move2
-rwxr-xr-xdb-update8
5 files changed, 12 insertions, 12 deletions
diff --git a/abslibre b/abslibre
index fa777ac..a5733f0 100755
--- a/abslibre
+++ b/abslibre
@@ -96,7 +96,7 @@ sync_pre_mips64el() {
# Create .abs.tar.gz tarballs
create_tarballs() {
for repo in ${ABSLIBRE}/{i686,x86_64}/*; do
- baserepo=$(basename $repo)
+ baserepo=${repo##*/}
arch=$(basename $(dirname $repo))
# Remove the old one
diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index 6455ed7..cb14382 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -16,7 +16,7 @@ clean_pkg() {
if [ -e "$pkg.sig" ]; then
mv -f "$pkg.sig" "$CLEANUP_DESTDIR"
fi
- touch "${CLEANUP_DESTDIR}/$(basename ${pkg})"
+ touch "${CLEANUP_DESTDIR}/${pkg##*/}"
fi
done
fi
diff --git a/db-functions b/db-functions
index 83e0613..52ad8bb 100644
--- a/db-functions
+++ b/db-functions
@@ -324,7 +324,7 @@ check_pkgfile() {
in_array "${pkgarch}" "${ARCHES[@]}" 'any' || return 1
- if echo "$(basename ${pkgfile})" | grep -q "${pkgname}-${pkgver}-${pkgarch}"; then
+ if echo "${pkgfile##*/}" | grep -q "${pkgname}-${pkgver}-${pkgarch}"; then
return 0
else
return 1
@@ -425,8 +425,8 @@ check_pkgrepos() {
[ -f "${FTP_BASE}/${PKGPOOL}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT} ] && return 1
[ -f "${FTP_BASE}/${PKGPOOL}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT}.sig ] && return 1
- [ -f "${FTP_BASE}/${PKGPOOL}/$(basename ${pkgfile})" ] && return 1
- [ -f "${FTP_BASE}/${PKGPOOL}/$(basename ${pkgfile}).sig" ] && return 1
+ [ -f "${FTP_BASE}/${PKGPOOL}/${pkgfile##*/}" ] && return 1
+ [ -f "${FTP_BASE}/${PKGPOOL}/${pkgfile##*/}.sig" ] && return 1
local repo
local arch
@@ -434,8 +434,8 @@ check_pkgrepos() {
for arch in "${ARCHES[@]}"; do
[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT} ] && return 1
[ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT}.sig ] && return 1
- [ -f "${FTP_BASE}/${repo}/os/${arch}/$(basename ${pkgfile})" ] && return 1
- [ -f "${FTP_BASE}/${repo}/os/${arch}/$(basename ${pkgfile}).sig" ] && return 1
+ [ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgfile##*/}" ] && return 1
+ [ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgfile##*/}.sig" ] && return 1
done
done
diff --git a/db-move b/db-move
index a6abb8f..f1c3dea 100755
--- a/db-move
+++ b/db-move
@@ -77,7 +77,7 @@ for pkgbase in "${args[@]:2}"; do
for pkgname in "${pkgnames[@]}"; do
for tarch in "${tarches[@]}"; do
pkgpath=$(getpkgfile "${ftppath_from}/${tarch}/"${pkgname}-${pkgver}-${pkgarch}${PKGEXT})
- pkgfile=$(basename "${pkgpath}")
+ pkgfile="${pkgpath##*/}"
# copy package to pool if needed
# TODO: can be removed once every package has been moved to the package pool
diff --git a/db-update b/db-update
index 60cc6cd..99c8be5 100755
--- a/db-update
+++ b/db-update
@@ -30,13 +30,13 @@ for repo in "${repos[@]}"; do
fi
for pkg in "${pkgs[@]}"; do
if [ -h "${pkg}" ]; then
- die "Package ${repo}/$(basename ${pkg}) is a symbolic link"
+ die "Package ${repo}/${pkg##*/} is a symbolic link"
fi
if ! check_pkgfile "${pkg}"; then
- die "Package ${repo}/$(basename ${pkg}) is not consistent with its meta data"
+ die "Package ${repo}/${pkg##*/} is not consistent with its meta data"
fi
if ! check_pkgrepos "${pkg}"; then
- die "Package ${repo}/$(basename ${pkg}) already exists in another repository"
+ die "Package ${repo}/${pkg##*/} already exists in another repository"
fi
done
# This is fucking obnoxious
@@ -55,7 +55,7 @@ for repo in "${repos[@]}"; do
add_pkgs=()
arch_pkgs=($(getpkgfiles "${STAGING}/${repo}/"*-${pkgarch}${PKGEXT} 2>/dev/null))
for pkg in "${arch_pkgs[@]}" "${any_pkgs[@]}"; do
- pkgfile="$(basename ${pkg})"
+ pkgfile="${pkg##*/}"
msg2 "${pkgfile} (${pkgarch})"
# any packages might have been moved by the previous run
if [ -f "${pkg}" ]; then