aboutsummaryrefslogtreecommitdiff
path: root/inception
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-08-20 14:11:27 -0300
committerSilvio Rhatto <rhatto@riseup.net>2017-08-20 14:11:27 -0300
commit83963a3b52484d59f144e0c930c2f13af8eaae36 (patch)
tree67d2aa23cdc9c31a85257798f738792a3a03a6c6 /inception
parent26e75d77b310921579be64634f500f6897733a71 (diff)
downloadapps-83963a3b52484d59f144e0c930c2f13af8eaae36.tar.gz
apps-83963a3b52484d59f144e0c930c2f13af8eaae36.tar.bz2
Inception: sync submodules
Diffstat (limited to 'inception')
-rwxr-xr-xinception7
1 files changed, 6 insertions, 1 deletions
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