[pacman-dev] [PATCH 2/3] Fix whitespace in makepkg.sh.in and makepkg-template.pl.in

Jason St. John jstjohn at purdue.edu
Sun Jul 21 21:09:58 EDT 2013


Replace spaces with tabs in one instance.
Remove extra spaces.

Signed-off-by: Jason St. John <jstjohn at purdue.edu>
---
 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 567514e..03dd6b8 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 at 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 2a39157..dfcb859 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
-- 
1.8.3.3



More information about the pacman-dev mailing list