aboutsummaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-11-17 00:42:40 +0000
committerng0 <ng0@n0.is>2019-11-17 00:42:40 +0000
commitae07ba8f0ec093148aaf4c8d841e118719addcd3 (patch)
treef3d9248b1cba38d8c1265e824ca29f46294cd9ff /bootstrap
parent5cb82d92ddbec05b22e630c4082456ad8d2b34be (diff)
downloadgnunet-ae07ba8f0ec093148aaf4c8d841e118719addcd3.tar.gz
gnunet-ae07ba8f0ec093148aaf4c8d841e118719addcd3.zip
bootstrap: no need for sleep.
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap33
1 files changed, 14 insertions, 19 deletions
diff --git a/bootstrap b/bootstrap
index af4f4d01f..1160ab13c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -23,9 +23,7 @@ check_uncrustify()
23{ 23{
24 if existence uncrustify; then 24 if existence uncrustify; then
25 echo "Installing uncrustify hook and configuration" 25 echo "Installing uncrustify hook and configuration"
26 # Install uncrustify format symlink (if possible)
27 ln -s contrib/uncrustify.cfg uncrustify.cfg 2> /dev/null 26 ln -s contrib/uncrustify.cfg uncrustify.cfg 2> /dev/null
28 # Install pre-commit hook (if possible)
29 ln -s ../../contrib/uncrustify_precommit .git/hooks/pre-commit 2> /dev/null 27 ln -s ../../contrib/uncrustify_precommit .git/hooks/pre-commit 2> /dev/null
30 else 28 else
31 echo "Uncrustify not detected, hook not installed." 29 echo "Uncrustify not detected, hook not installed."
@@ -38,17 +36,17 @@ check_uncrustify()
38check_yapf() 36check_yapf()
39{ 37{
40 if existence yapf || \ 38 if existence yapf || \
41 existence yapf3.0 || \ 39 existence yapf3.0 || \
42 existence yapf3.1 || \ 40 existence yapf3.1 || \
43 existence yapf3.2 || \ 41 existence yapf3.2 || \
44 existence yapf3.3 || \ 42 existence yapf3.3 || \
45 existence yapf3.4 || \ 43 existence yapf3.4 || \
46 existence yapf3.5 || \ 44 existence yapf3.5 || \
47 existence yapf3.6 || \ 45 existence yapf3.6 || \
48 existence yapf3.7 || \ 46 existence yapf3.7 || \
49 existence yapf3.8 || \ 47 existence yapf3.8 || \
50 existence yapf3.9 || \ 48 existence yapf3.9 || \
51 existence yapf4.0; then 49 existence yapf4.0; then
52 echo "Installing yapf symlink" 50 echo "Installing yapf symlink"
53 ln -s contrib/conf/.style.yapf 2> /dev/null 51 ln -s contrib/conf/.style.yapf 2> /dev/null
54 else 52 else
@@ -61,9 +59,9 @@ check_libtool()
61 echo "checking for libtoolize / libtool... " 59 echo "checking for libtoolize / libtool... "
62 60
63 if existence libtool || \ 61 if existence libtool || \
64 existence libtoolize || \ 62 existence libtoolize || \
65 existence glibtoolize || \ 63 existence glibtoolize || \
66 existence slibtool; then 64 existence slibtool; then
67 autoreconf -if 65 autoreconf -if
68 . "bin/pogen.sh" 66 . "bin/pogen.sh"
69 else 67 else
@@ -75,11 +73,8 @@ check_libtool()
75main() 73main()
76{ 74{
77 cleanup 75 cleanup
78 sleep 1
79 check_uncrustify 76 check_uncrustify
80 sleep 1
81 check_yapf 77 check_yapf
82 sleep 1
83 check_libtool 78 check_libtool
84} 79}
85 80