Updates inception

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/README.md b/README.md
index edceabd3d92425a3ac1c6c910a31b09945169d5c..caaac6cd76846391f3ab4f54a69011398fb711aa 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,2 +1,4 @@
-inception
-=========
+The Inception
+=============
+
+Infects your homedir with configurations and applications.

diff --git a/TODO.md b/TODO.md
index 74e5cc0878838785b64bb8ccb111be978eff12f1..928a9f0161c28e9a780c88dcc4966a0cfe107daa 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -1,2 +1,4 @@
 TODO
 ====
+
+* update action with trusted keys support using custom gpg keydir

diff --git a/infection b/infection
index fc29b1fefe25a6f925b41b3d11a608b182a1122c..0f9e9ad8f3eb23573e1bf6ae43e190c82233a2ba 100755 (executable)
--- a/infection
+++ b/infection
@@ -32,14 +32,16 @@ function infection_init {
     #
     # This way we can easily check the integrity of our dotfiles
     # once the integrity of the apps repo is checked
-    if [ -e "$HOME/.dotfiles" ]; then
-       if [ ! -h "$HOME/.dotfiles" ] || [ "`readlink $HOME/.dotfiles`" != "apps/dotfiles" ]; then
-         mkdir -p $BACKUPS
-         mv $HOME/.dotfiles $BACKUPS/
-         ( cd $HOME &> /dev/null && ln -s apps/dotfiles .dotfiles )
+    if [ -e "$HOME/apps/dotfiles" ]; then
+      if [ -e "$HOME/.dotfiles" ]; then
+        if [ ! -h "$HOME/.dotfiles" ] || [ "`readlink $HOME/.dotfiles`" != "apps/dotfiles" ]; then
+          mkdir -p $BACKUPS
+          mv $HOME/.dotfiles $BACKUPS/
+          ( cd $HOME &> /dev/null && ln -s apps/dotfiles .dotfiles )
+        fi
+      else
+        ( cd $HOME &> /dev/null && ln -s apps/dotfiles .dotfiles )
       fi
-    else
-      ( cd $HOME &> /dev/null && ln -s apps/dotfiles .dotfiles )
     fi
 
     #if [ ! -e "$HOME/.dotfiles" ]; then