]> gitweb.fluxo.info Git - kvmx.git/commitdiff
Provision: development: inception and metadot update
authorSilvio Rhatto <rhatto@riseup.net>
Sat, 25 Mar 2017 01:49:41 +0000 (22:49 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Sat, 25 Mar 2017 01:49:41 +0000 (22:49 -0300)
share/provision/development

index 32503c560689d1549db329f69cf280b73d74cf70..eaa77c33b3781f7c9c4575224b3fb64e48b4d404 100755 (executable)
@@ -35,12 +35,15 @@ $APT_INSTALL git
 # Tools
 if [ ! -e "apps" ]; then
   git clone --recursive https://git.fluxo.info/rhatto/apps
+  apps/inception init
 else
-  echo "Updating apps repository..."
-  ( cd apps &> /dev/null && git pull && git submodule update --init )
+  echo "Updating locally-installed apps and dotfiles..."
+  apps/inception fetch
+  apps/inception merge
+  apps/metadot/metadot fetch
+  apps/metadot/metadot merge
 fi
 
-apps/inception       init
 apps/metadot/metadot load-bundle development
 apps/metadot/metadot deps-bundle development