bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

repo-add: use bash equivalents of basename/dirname

Browse source 
Signed-off-by: Dave Reisner <d@falconindy.com>
This commit is contained in:
Dave Reisner 2011-06-20 10:32:12 -04:00 • committed by Dan McGee
parent 3847446603
commit ab53aa3e3c
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/repo-add.sh.in
View file

@ -42,7 +42,7 @@ m4_include(library/output_format.sh)
# print usage instructions # print usage instructions
usage() { usage() {
cmd="$(basename $0)" cmd=${0##*/}
printf "%s (pacman) %s\n\n" "$cmd" "$myver" printf "%s (pacman) %s\n\n" "$cmd" "$myver"
if [[ $cmd == "repo-add" ]] ; then if [[ $cmd == "repo-add" ]] ; then
printf "$(gettext "Usage: repo-add [options] <path-to-db> <package|delta> ...\n")" printf "$(gettext "Usage: repo-add [options] <path-to-db> <package|delta> ...\n")"
@ -74,7 +74,7 @@ See %s(8) for more details and descriptions of the available options.\n\n")" $cm
} }
version() { version() {
cmd="$(basename $0)" cmd=${0##*/}
printf "%s (pacman) %s\n\n" "$cmd" "$myver" printf "%s (pacman) %s\n\n" "$cmd" "$myver"
printf "$(gettext "\ printf "$(gettext "\
Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>\n\n\ Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>\n\n\
@ -301,7 +301,7 @@ db_write_entry()
# create desc entry # create desc entry
msg2 "$(gettext "Creating '%s' db entry...")" 'desc' msg2 "$(gettext "Creating '%s' db entry...")" 'desc'
echo -e "%FILENAME%\n$(basename "$1")\n" >>desc echo -e "%FILENAME%\n${1##*/}\n" >>desc
echo -e "%NAME%\n$pkgname\n" >>desc echo -e "%NAME%\n$pkgname\n" >>desc
[[ -n $pkgbase ]] && echo -e "%BASE%\n$pkgbase\n" >>desc [[ -n $pkgbase ]] && echo -e "%BASE%\n$pkgbase\n" >>desc
echo -e "%VERSION%\n$pkgver\n" >>desc echo -e "%VERSION%\n$pkgver\n" >>desc
@ -373,7 +373,7 @@ db_remove_entry() {
mv "$pkgentry/deltas" "$tmpdir/$pkgname.deltas" mv "$pkgentry/deltas" "$tmpdir/$pkgname.deltas"
fi fi
msg2 "$(gettext "Removing existing entry '%s'...")" \ msg2 "$(gettext "Removing existing entry '%s'...")" \
"$(basename $pkgentry)" "${pkgentry##*/}"
rm -rf $pkgentry rm -rf $pkgentry
pkgentry=$(find_pkgentry $pkgname) pkgentry=$(find_pkgentry $pkgname)
done done
@ -510,7 +510,7 @@ case "$1" in
esac esac
# figure out what program we are # figure out what program we are
cmd="$(basename $0)" cmd=${0##*/}
if [[ $cmd != "repo-add" && $cmd != "repo-remove" ]]; then if [[ $cmd != "repo-add" && $cmd != "repo-remove" ]]; then
error "$(gettext "Invalid command name '%s' specified.")" "$cmd" error "$(gettext "Invalid command name '%s' specified.")" "$cmd"
exit 1 exit 1
@ -585,7 +585,7 @@ if (( success )); then
"$REPO_DB_FILE" ;; "$REPO_DB_FILE" ;;
esac esac
filename=$(basename "$REPO_DB_FILE") filename=${REPO_DB_FILE##*/}
pushd "$tmpdir" >/dev/null pushd "$tmpdir" >/dev/null
if [[ -n $(ls) ]]; then if [[ -n $(ls) ]]; then