From 8e533b0363551febeab7521b21d16ff46a1722aa Mon Sep 17 00:00:00 2001
From: "Jason St. John" <jstjohn@purdue.edu>
Date: Mon, 22 Jul 2013 03:09:58 +0200
Subject: Fix whitespace in makepkg.sh.in and makepkg-template.pl.in
Replace spaces with tabs in one instance.
Remove extra spaces.
Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Signed-off-by: Allan McRae <allan@archlinux.org>
---
scripts/makepkg-template.pl.in | 2 +-
scripts/makepkg.sh.in | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/makepkg-template.pl.in b/scripts/makepkg-template.pl.in
index 567514e1..03dd6b83 100755
--- a/scripts/makepkg-template.pl.in
+++ b/scripts/makepkg-template.pl.in
@@ -185,7 +185,7 @@ sub usage {
sub version {
my ($exitstatus) = @_;
printf "makepkg-template (pacman) %s\n", '@PACKAGE_VERSION@';
- print gettext(
+ print gettext(
'Copyright (c) 2013 Pacman Development Team <pacman-dev@archlinux.org>.'."\n".
'This is free software; see the source for copying conditions.'."\n".
'There is NO WARRANTY, to the extent permitted by law.'."\n");
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 06f7c253..a2d0d7d6 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -548,7 +548,7 @@ download_git() {
elif (( ! HOLDVER )); then
cd_safe "$dir"
# Make sure we are fetching the right repo
- if [[ "$url" != "$(git config --get remote.origin.url)" ]] ; then
+ if [[ "$url" != "$(git config --get remote.origin.url)" ]] ; then
error "$(gettext "%s is not a clone of %s")" "$dir" "$url"
plain "$(gettext "Aborting...")"
exit 1
@@ -1606,10 +1606,10 @@ tidy_install() {
done
# check for references to the build and package directory
- if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${srcdir}" ; then
+ if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${srcdir}" ; then
warning "$(gettext "Package contains reference to %s")" "\$srcdir"
fi
- if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${pkgdirbase}" ; then
+ if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${pkgdirbase}" ; then
warning "$(gettext "Package contains reference to %s")" "\$pkgdir"
fi
@@ -2904,7 +2904,7 @@ msg "$(gettext "Making package: %s")" "$pkgbase $fullver ($(date))"
# if we are creating a source-only package, go no further
if (( SOURCEONLY )); then
if [[ -f $SRCPKGDEST/${pkgbase}-${fullver}${SRCEXT} ]] \
- && (( ! FORCE )); then
+ && (( ! FORCE )); then
error "$(gettext "A source package has already been built. (use %s to overwrite)")" "-f"
exit 1
fi
--
cgit v1.2.3-70-g09d2