1
0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-16 06:15:08 -05:00

Fix printing of paths

Originally printed a leading \ before all path names as the `' would be
removed during the make. Using '' should be just as good as using `'.

paccache.sh.in:
die "cachedir \`%s' does not exist or is not a directory" "$cachedir"

paccache
die "cachedir \%s does not exist or is not a directory" "$cachedir"

Signed-off-by: William Giokas <1007380@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
William Giokas 2013-01-21 03:12:40 -06:00 committed by Allan McRae
parent 6bbf6e8fa1
commit 457642231e

View File

@ -132,7 +132,7 @@ summarize() {
if (( delete )); then if (( delete )); then
printf -v output 'finished: %d packages removed' "$filecount" printf -v output 'finished: %d packages removed' "$filecount"
elif (( move )); then elif (( move )); then
printf -v output "finished: %d packages moved to \`%s'" "$filecount" "$movedir" printf -v output "finished: %d packages moved to '%s'" "$filecount" "$movedir"
elif (( dryrun )); then elif (( dryrun )); then
if (( verbose )); then if (( verbose )); then
msg "Candidate packages:" msg "Candidate packages:"
@ -266,10 +266,10 @@ case $(( dryrun+delete+move )) in
esac esac
[[ -d $cachedir ]] || [[ -d $cachedir ]] ||
die "cachedir \`%s' does not exist or is not a directory" "$cachedir" die "cachedir '%s' does not exist or is not a directory" "$cachedir"
[[ $movedir && ! -d $movedir ]] && [[ $movedir && ! -d $movedir ]] &&
die "move-to directory \`%s' does not exist or is not a directory" "$movedir" die "move-to directory '%s' does not exist or is not a directory" "$movedir"
if (( move || delete )); then if (( move || delete )); then
# make it an absolute path since we're about to chdir # make it an absolute path since we're about to chdir
@ -278,7 +278,7 @@ if (( move || delete )); then
fi fi
# unlikely that this will fail, but better make sure # unlikely that this will fail, but better make sure
cd "$cachedir" >/dev/null || die "failed to chdir to \`%s'" "$cachedir" cd "$cachedir" >/dev/null || die "failed to chdir to '%s'" "$cachedir"
# note that these results are returned in an arbitrary order from awk, but # note that these results are returned in an arbitrary order from awk, but
# they'll be resorted (in summarize) iff we have a verbosity level set. # they'll be resorted (in summarize) iff we have a verbosity level set.