From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Sep 2008 02:53:01 +0000 (-0700)
Subject: Merge branch 'jc/maint-template-permbits' into maint
X-Git-Tag: v1.6.0.3~81
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f99b1d23bb9a8f6a8f15df578e65bb04664cbdeb?hp=6380d128ed852d0c4feb4a362f98aa3709c4962e

Merge branch 'jc/maint-template-permbits' into maint

* jc/maint-template-permbits:
Fix permission bits on sources checked out with an overtight umask
---

diff --git a/templates/Makefile b/templates/Makefile
index cc3fc3094c..a12c6e214e 100644
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -23,17 +23,19 @@ all: boilerplates.made custom
 
 bpsrc = $(filter-out %~,$(wildcard *--*))
 boilerplates.made : $(bpsrc)
-	$(QUIET)ls *--* 2>/dev/null | \
+	$(QUIET)umask 022 && ls *--* 2>/dev/null | \
 	while read boilerplate; \
 	do \
 		case "$$boilerplate" in *~) continue ;; esac && \
 		dst=`echo "$$boilerplate" | sed -e 's|^this|.|;s|--|/|g'` && \
 		dir=`expr "$$dst" : '\(.*\)/'` && \
-		$(INSTALL) -d -m 755 blt/$$dir && \
+		mkdir -p blt/$$dir && \
 		case "$$boilerplate" in \
-		*--) ;; \
-		*) cp -p $$boilerplate blt/$$dst ;; \
-		esac || exit; \
+		*--) continue;; \
+		esac && \
+		cp $$boilerplate blt/$$dst && \
+		if test -x "blt/$$dst"; then rx=rx; else rx=r; fi && \
+		chmod a+$$rx "blt/$$dst" || exit; \
 	done && \
 	date >$@