summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-11-17 01:10:13 +0000
committerng0 <ng0@n0.is>2019-11-17 01:10:13 +0000
commitd826278ee3c799eeae0f2633258c44725a688a8f (patch)
tree001f5c040ac53594514913020774f7416ad24515 /bootstrap
parented7e4ab51d0f647c8c4e36f06cca4a5c8a61b132 (diff)
bootstrap: add git submodule sync. force symlinks.
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap23
1 files changed, 20 insertions, 3 deletions
diff --git a/bootstrap b/bootstrap
index 1160ab13c..e846307d8 100755
--- a/bootstrap
+++ b/bootstrap
@@ -23,8 +23,8 @@ check_uncrustify()
{
if existence uncrustify; then
echo "Installing uncrustify hook and configuration"
- ln -s contrib/uncrustify.cfg uncrustify.cfg 2> /dev/null
- ln -s ../../contrib/uncrustify_precommit .git/hooks/pre-commit 2> /dev/null
+ ln -fs contrib/build-common/conf/uncrustify.cfg uncrustify.cfg 2> /dev/null
+ ln -fs contrib/build-common/conf/uncrustify_precommit .git/hooks/pre-commit 2> /dev/null
else
echo "Uncrustify not detected, hook not installed."
echo "Please install uncrustify if you plan on doing development"
@@ -48,7 +48,7 @@ check_yapf()
existence yapf3.9 || \
existence yapf4.0; then
echo "Installing yapf symlink"
- ln -s contrib/conf/.style.yapf 2> /dev/null
+ ln -fs contrib/build-common/conf/.style.yapf .style.yapf 2> /dev/null
else
echo "yapf not detected, please install yapf if you plan on contributing python code"
fi
@@ -70,9 +70,26 @@ check_libtool()
fi
}
+submodules()
+{
+ # Try to update the submodule. Since bootstrap
+ # is also invoked by distributors, we must
+ # ignore any failing of this function as we
+ # could have no outgoing network connection
+ # in a restricted environment.
+ if ! git --version >/dev/null; then
+ echo "git not installed, skipping submodule update"
+ else
+ git submodule update --init || true
+ git submodule update --recursive --remote || true
+ git submodule sync || true
+ fi
+}
+
main()
{
cleanup
+ submodules
check_uncrustify
check_yapf
check_libtool