fixed existing conf check

bash/install

@@ -4,14 +4,9 @@ dir="$(dirname $(readlink -f "${0}"))"
 
 for file in bash_aliases bash_preexec bash_preexec_hooks bashrc git-prompt.sh nma_exclude
 do
-  if [ -e ~/."${file}" ]
+  if [ -f ~/."${file}" ]
   then
-    if [ -h ~/."${file}" ]
-    then
-      rm ~/."${file}"
-    else
-      mv ~/."${file}" ~/."${file}.old"
-    fi
-  fi
-  ln -s "${dir}/${file}" ~/."${file}"
+    mv ~/."${file}" ~/."${file}.old"
+  fi &&
+  ln -sf "${dir}/${file}" ~/."${file}"
 done

git/install

@@ -4,14 +4,9 @@ dir="$(dirname $(readlink -f "${0}"))"
 
 for file in gitconfig
 do
-  if [ -e ~/."${file}" ]
+  if [ -f ~/."${file}" ]
   then
-    if [ -h ~/."${file}" ]
-    then
-      rm ~/."${file}"
-    else
-      mv ~/."${file}" ~/."${file}.old"
-    fi
-  fi
+    mv ~/."${file}" ~/."${file}.old"
+  fi &&
   ln -sf "${dir}/${file}" ~/."${file}"
 done

gnome-terminal/install

@@ -1,12 +1,7 @@
 #! /usr/bin/env bash
 
-if [ -e ~/.gconf/apps/gnome-terminal ]
+if [ -d ~/.gconf/apps/gnome-terminal ]
 then
-  if [ -h ~/.gconf/apps/gnome-terminal ]
-  then
-    rm ~/.gconf/apps/gnome-terminal
-  else
-    mv ~/.gconf/apps/gnome-terminal ~/.gconf/apps/gnome-termnial.old
-  fi
+  mv ~/.gconf/apps/gnome-terminal ~/.gconf/apps/gnome-termnial.old
 fi &&
 ln -sf "$PWD"/gnome-terminal ~/.gconf/apps/gnome-terminal

i3/install

@@ -2,13 +2,8 @@
 
 dir="$(dirname $(readlink -f "${0}"))"
 
-if [ -e ~/.i3 ]
+if [ -d ~/.i3 ]
 then
-  if [ -h ~/.i3 ]
-  then
-    rm ~/.i3
-  else
-    mv ~/.i3 ~/.i3.old
-  fi
+  mv ~/.i3 ~/.i3.old
 fi &&
-ln -s "${dir}/i3" ~/.i3
+ln -sf "${dir}/i3" ~/.i3

nma/install

@@ -2,4 +2,4 @@
 
 dir="$(dirname $(readlink -f "${0}"))"
 
-cp "${dir}/nma" /usr/local/bin
+cp "${dir}/nma" /usr/local/bin/nma

vim/install

@@ -2,25 +2,15 @@
 
 dir="$(dirname $(readlink -f "${0}"))"
 
-if [ -e ~/.vim ]
+if [ -d ~/.vim ]
 then
-  if [ -h ~/.vim ]
-  then
-    rm ~/.vim
-  else
-    mv ~/.vim ~/.vim.old
-  fi
+  mv ~/.vim ~/.vim.old
 fi &&
 ln -sf "${dir}/vim" ~/.vim &&
 
-if [ -e ~/.vimrc ]
+if [ -f ~/.vimrc ]
 then
-  if [ -h ~/.vimrc ]
-  then
-    rm ~/.vimrc
-  else
-    mv ~/.vimrc ~/.vimrc.old
-  fi
+  mv ~/.vimrc ~/.vimrc.old
 fi &&
 ln -sf "${dir}/vimrc" ~/.vimrc &&