diff options
Diffstat (limited to 'renew-config')
-rwxr-xr-x | renew-config | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/renew-config b/renew-config index fbd05c7..6b4a24c 100755 --- a/renew-config +++ b/renew-config @@ -14,8 +14,13 @@ git fetch origin 2>/dev/null git push origin master 2>/dev/null if ! diff -q "$REPO/Metadata/clients.xml" "$REAL/Metadata/clients.xml" >/dev/null; then - error "$REPO: Metadata/clients.xml out of date. -You probably should update it with $REAL/Metadata/clients.xml" + echo "$REPO: Metadata/clients.xml out of date." 1>&2 + echo "You probably should update it with $REAL/Metadata/clients.xml" 1>&2 + echo 1>&2 + $DIFF -u "$REPO/Metadata/clients.xml" "$REAL/Metadata/clients.xml" 1>&2 + echo 1>&2 + echo "Maybe you want:" 1>&2 + error "cp -i '$REAL/Metadata/clients.xml' '$REPO/Metadata/clients.xml'" fi if [ -n "$(git rev-list HEAD..origin/master)" ]; then |