X-Git-Url: https://git.m6w6.name/?p=m6w6%2Frepo-template;a=blobdiff_plain;f=init;h=cbf6dc09b29fc28a469734440c2fe9a5a7b7724b;hp=f172675d8665ca08fa031dc0388b165a7d17c2a2;hb=8d5467b5d250ad94e7677a763abf1bbd8535fcae;hpb=70914d6822b398bed806b0b62ff3da08435a98a8 diff --git a/init b/init index f172675..cbf6dc0 100755 --- a/init +++ b/init @@ -15,6 +15,7 @@ do SRCFILE=$(dirname -- $0)/presets/$FILE case $FILE in .|..) + echo $FILE continue ;; composer.json) @@ -22,7 +23,7 @@ do 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 @@ -38,8 +39,7 @@ do 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