2 files changed, 41 insertions, 18 deletions
diff --git a/README.md b/README.md
index 406e75f..9c6170f 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,10 @@ Inception
 
 A more radical approach takes over of all your environment (shell and desktop experience):
 
-    $HOME/apps/inception
+    $HOME/apps/inception init
 
-Then logout and log in again. You should have a nice workspace now.
+Then, after manually checking repository versions:
+
+    $HOME/apps/inception load
+
+You should have a nice workspace now :)
diff --git a/inception b/inception
index 558dd6a..6602670 100755
--- a/inception
+++ b/inception
@@ -7,19 +7,38 @@
 BASENAME="`basename $0`"
 DIRNAME="`dirname $0`"
 
-# Setup
-(
-  cd $DIRNAME
-
-  echo "Initializing submodules..."
-  git submodule update --init
-  
-  echo "Cloning default dotfiles..."
-  ./metadot/metadot clone default
-
-  echo "Loading all dotfiles..."
-  ./metadot/metadot load --all
-)
-
-# Teardown
-echo "Done. Logout and login again to apply all changes."
+# Main
+if [ -z "$1" ] || [ "$1" == "init" ]; then
+  (
+    cd $DIRNAME
+
+    echo "Initializing submodules..."
+    git submodule update --init
+
+    echo "Cloning default dotfiles..."
+    ./metadot/metadot clone default
+
+    echo "Checking latest tag..."
+    cd $HOME/.dotfiles
+    $DIRNAME/utils-git/git-check-tag
+
+    echo "Checking out the latest tag..."
+    $DIRNAME/utils-git/git-checkout-tag
+
+    echo "Checking dotfiles..."
+    ./metadot/metadot version
+
+    echo ""
+    echo "Please manually verify dotfiles version and tag from the above output."
+    echo "If everything is fine, proceed running this command again with the 'load' parameter."
+  )
+elif [ "$1" == "load" ]; then
+  (
+    cd $DIRNAME
+
+    echo "Loading all dotfiles..."
+    ./metadot/metadot load --all
+  )
+
+  echo "Done. Logout and login again to apply all changes."
+fi