From: Silvio Rhatto Date: Sun, 20 Aug 2017 17:11:27 +0000 (-0300) Subject: Inception: sync submodules X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=83963a3b52484d59f144e0c930c2f13af8eaae36;p=rhatto%2Fapps.git Inception: sync submodules --- diff --git a/inception b/inception index 3d536a3..2c0d2ff 100755 --- a/inception +++ b/inception @@ -22,6 +22,7 @@ function inception_init { cd $DIRNAME echo "Initializing submodules..." + $GIT submodule sync --recursive $GIT submodule update --init --recursive if [ ! -e "$HOME/.dotfiles" ]; then @@ -134,7 +135,11 @@ function inception_fetch { # Merge function inception_merge { - ( cd $DIRNAME && $GIT merge origin/master && $GIT submodule update --init --recursive ) + ( + cd $DIRNAME && $GIT merge origin/master && \\ + $GIT submodule sync --recursive && \\ + $GIT submodule update --init --recursive + ) } # Main diff --git a/metadot b/metadot index ad35aca..b21f57a 160000 --- a/metadot +++ b/metadot @@ -1 +1 @@ -Subproject commit ad35aca0019ff3624f48f5148e2cffc2c0b58acc +Subproject commit b21f57a3214055c88dafc1fd9332d75bf82519bc