From 7fae809aa0d2cb7ad029ce71d7837fca578dd4bd Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 14 Feb 2021 09:09:09 +0100 Subject: [PATCH] update tolua repo if needed --- s/cmake-init | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/s/cmake-init b/s/cmake-init index 0fe4735c9..91600cc13 100755 --- a/s/cmake-init +++ b/s/cmake-init @@ -107,20 +107,22 @@ HEREDOC path="$(which tolua)" if [ "$HAVE_TOLUA" = "0" ] || [ -z $path ] ; then - echo "tolua is not installed, building from source" - cd $ROOT - if [ ! -d tolua/include ]; then - echo "fetching tolua from github..." - git clone https://github.com/ennorehling/tolua.git tolua - fi - echo "building tolua..." +echo "tolua is not installed, building from source" +cd $ROOT +if [ ! -d tolua/include ]; then + echo "fetching tolua from github..." + git clone https://github.com/ennorehling/tolua.git tolua cd tolua - make - cd - +else + cd tolua + git pull --rebase +fi +echo "building tolua..." +make +cd - cat >> $BUILD/config.cmake <