[GNUnet-SVN] [taler-exchange] branch master updated (5cfb3d3b -> 3742239c)

[gnunet]

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

dold pushed a change to branch master
in repository exchange.

    from 5cfb3d3b fix ftbfs
     new e59a724d uncrustify config tweaks
     new 3742239c print message if crustify is not installed

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 contrib/uncrustify.cfg |  6 ++++++
 contrib/uncrustify.sh  | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/contrib/uncrustify.cfg b/contrib/uncrustify.cfg
index c9ca7651..5360f1ca 100644
--- a/contrib/uncrustify.cfg
+++ b/contrib/uncrustify.cfg
@@ -4,12 +4,16 @@ output_tab_size = 2
 indent_columns = 2
 indent_with_tabs = 0
 indent_case_brace = 2
+indent_label=0
 
 code_width=80
 cmd_width=80
 
+# Leave most comments alone for now
+cmt_indent_multi=false
 sp_cmt_cpp_start=add
 
+
 ls_for_split_full=true
 ls_func_split_full=true
 ls_code_width=true
@@ -31,9 +35,11 @@ nl_brace_else=add
 nl_elseif_brace=add
 nl_while_brace=add
 nl_switch_brace=add
+
 # no newline between "else" and "if"
 nl_else_if=remove
 
+nl_func_paren=remove
 nl_assign_brace=remove
 
 # No extra newlines that cause noisy diffs
diff --git a/contrib/uncrustify.sh b/contrib/uncrustify.sh
index 09974173..e8e05d3e 100755
--- a/contrib/uncrustify.sh
+++ b/contrib/uncrustify.sh
@@ -1,3 +1,14 @@
 #!/usr/bin/env bash
+
+set -eu
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-find "$DIR/../src" \( -name "*.cpp" -o -name "*.c" -o -name "*.h" \) -exec 
uncrustify -c "$DIR/uncrustify.cfg" --replace --no-backup {} +
+
+if ! uncrustify --version >/dev/null; then
+  echo "you need to install uncrustify for indentation"
+  exit 1
+fi
+
+find "$DIR/../src" \( -name "*.cpp" -o -name "*.c" -o -name "*.h" \) \
+  -exec uncrustify -c "$DIR/uncrustify.cfg" --replace --no-backup {} + \
+  || true

-- 
To stop receiving notification emails like this one, please contact
address@hidden.