From 8ba9aca900a76920415babccb3ed0fdd7ad17c6a Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Thu, 9 Aug 2018 18:16:37 +0000 Subject: [PATCH] fixed attach script --- TeaSpeak | 2 +- attach_modules.sh | 10 +++++++++- libraries/DataPipes | 2 +- libraries/boringssl | 2 +- libraries/breakpad | 2 +- libraries/event | 2 +- libraries/protobuf | 2 +- libraries/tomcrypt | 2 +- libraries/yaml-cpp | 2 +- 9 files changed, 17 insertions(+), 9 deletions(-) diff --git a/TeaSpeak b/TeaSpeak index 58d3e75..cee9040 160000 --- a/TeaSpeak +++ b/TeaSpeak @@ -1 +1 @@ -Subproject commit 58d3e758b5f83c6724b5ece24b5fc672b1205ab8 +Subproject commit cee9040f92c68d4ffe7ef426f7cd6f7ebcc87ecc diff --git a/attach_modules.sh b/attach_modules.sh index ab4e5de..b4826fd 100755 --- a/attach_modules.sh +++ b/attach_modules.sh @@ -1,3 +1,11 @@ #!/bin/bash -git submodule foreach -q --recursive 'echo "Updating $name"; git checkout $(git config -f $toplevel/.gitmodules submodule.$name.branch || echo master); git pull origin $(git config -f $toplevel/.gitmodules submodule.$name.branch || echo master)' +git submodule foreach -q --recursive ' +echo "Updating $name"; +BRANCH=$(git config -f $toplevel/.gitmodules submodule.$name.branch || echo master) +if [ -z ${BRANCH} ]; then + BRANCH="master" +fi +git checkout ${BRANCH}; +echo "git pull origin ${BRANCH}" +git pull origin ${BRANCH}' diff --git a/libraries/DataPipes b/libraries/DataPipes index 43c9764..f8b8024 160000 --- a/libraries/DataPipes +++ b/libraries/DataPipes @@ -1 +1 @@ -Subproject commit 43c97648631c22d2ac9439944c7214175eda7605 +Subproject commit f8b8024caacbef279cd8951a14afe8fd464cc32a diff --git a/libraries/boringssl b/libraries/boringssl index e7b7877..a3202d7 160000 --- a/libraries/boringssl +++ b/libraries/boringssl @@ -1 +1 @@ -Subproject commit e7b78770eca9724a7af2f344588693dcf8b327df +Subproject commit a3202d7bc1e538bc00cda7b429ca8f77f8093f30 diff --git a/libraries/breakpad b/libraries/breakpad index 948ce04..7b98eda 160000 --- a/libraries/breakpad +++ b/libraries/breakpad @@ -1 +1 @@ -Subproject commit 948ce04ed74397331c158c13209fd2370c2dbd5a +Subproject commit 7b98edabb61c6f06199fc22ffc9ebff580dfefc3 diff --git a/libraries/event b/libraries/event index c3a6fe7..ee12c51 160000 --- a/libraries/event +++ b/libraries/event @@ -1 +1 @@ -Subproject commit c3a6fe75e1511a4c7a7a6ef0a5954b1918902933 +Subproject commit ee12c516cf5766b2c32203dcc20c32b8691a8ebb diff --git a/libraries/protobuf b/libraries/protobuf index 3d62db3..c9a30c2 160000 --- a/libraries/protobuf +++ b/libraries/protobuf @@ -1 +1 @@ -Subproject commit 3d62db3ecd5377025a458bca827ab4ca12d5c1f0 +Subproject commit c9a30c2c279431466e30541ac7c2cd9776c93b9c diff --git a/libraries/tomcrypt b/libraries/tomcrypt index 0f7fd3c..2c202ee 160000 --- a/libraries/tomcrypt +++ b/libraries/tomcrypt @@ -1 +1 @@ -Subproject commit 0f7fd3c606c204cf13b39ca35722782d3d05e319 +Subproject commit 2c202ee7c530b84c6387e0dd71be04ac254a1d17 diff --git a/libraries/yaml-cpp b/libraries/yaml-cpp index 1698b47..c90c08c 160000 --- a/libraries/yaml-cpp +++ b/libraries/yaml-cpp @@ -1 +1 @@ -Subproject commit 1698b47b65feded180f44d762ddaf7181a270608 +Subproject commit c90c08ccc9a08abcca609064fb9a856dfdbbb7b4