[taler-merchant] branch master updated: make sure that bootstrap succeeds despite failing commands

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new e7ab678e make sure that bootstrap succeeds despite failing commands
e7ab678e is described below

commit e7ab678e50cd9569b21dcc0d3864bb1cd539a6f0
Author: Florian Dold <florian@dold.me>
AuthorDate: Fri Apr 23 11:52:25 2021 +0200

    make sure that bootstrap succeeds despite failing commands
---
 bootstrap | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrap b/bootstrap
index 23e2cbce..7a3f340c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -22,9 +22,9 @@ existence()
 if existence uncrustify; then
     echo "Installing uncrustify hook and configuration"
     # Install uncrustify format symlink (if possible)
-    ln -s contrib/uncrustify.cfg uncrustify.cfg 2> /dev/null
+    ln -s contrib/uncrustify.cfg uncrustify.cfg 2> /dev/null || true
     # Install pre-commit hook (if possible)
-    ln -s ../../contrib/uncrustify_precommit .git/hooks/pre-commit 2> /dev/null
+    ln -s ../../contrib/uncrustify_precommit .git/hooks/pre-commit 2> 
/dev/null || true
 else
     echo "Uncrustify not detected, hook not installed. Please install 
uncrustify if you plan on doing development"
 fi

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.