projects
/
m6w6
/
repo-template
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
typo
[m6w6/repo-template]
/
init
diff --git
a/init
b/init
index f172675d8665ca08fa031dc0388b165a7d17c2a2..cbf6dc09b29fc28a469734440c2fe9a5a7b7724b 100755
(executable)
--- a/
init
+++ b/
init
@@
-15,6
+15,7
@@
do
SRCFILE=$(dirname -- $0)/presets/$FILE
case $FILE in
.|..)
SRCFILE=$(dirname -- $0)/presets/$FILE
case $FILE in
.|..)
+ echo $FILE
continue
;;
composer.json)
continue
;;
composer.json)
@@
-22,7
+23,7
@@
do
SRCFILE=$(mktemp)
php -d variables_order=E $(dirname -- $0)/presets/composer.json >$SRCFILE
;;
SRCFILE=$(mktemp)
php -d variables_order=E $(dirname -- $0)/presets/composer.json >$SRCFILE
;;
- package.xml|CREDITS)
+ package.xml|CREDITS
|config.*|Makefile.frag
)
test "${PECL+set}" = "" && continue
SRCFILE=$(mktemp)
php -d variables_order=E $(dirname -- $0)/presets/$FILE >$SRCFILE
test "${PECL+set}" = "" && continue
SRCFILE=$(mktemp)
php -d variables_order=E $(dirname -- $0)/presets/$FILE >$SRCFILE
@@
-38,8
+39,7
@@
do
if test -e $FILE
then
DIFF="diff -udbBE -- $SRCFILE $FILE"
if test -e $FILE
then
DIFF="diff -udbBE -- $SRCFILE $FILE"
- # ignore changes with only additions or removals
- if ! $DIFF | awk '{if(NR<4){next}}/^-/{if(p){exit 1}m++}/^\+/{if(m){exit 1}p++}'
+ if ! $DIFF >/dev/null
then
while read -n 1 -p "File $FILE exists and differs (q,s,r,d,v,?) " ACTION
do
then
while read -n 1 -p "File $FILE exists and differs (q,s,r,d,v,?) " ACTION
do