improved install scripts

bash/install

@@ -1,6 +1,17 @@
 #! /usr/bin/env bash
 
+dir="$(dirname $(readlink -f "${0}"))"
+
 for file in bash_aliases bash_preexec bash_preexec_hooks bashrc git-prompt.sh nma_exclude
 do
-  ln -sf "$PWD"/$file ~/.$file
+  if [ -e ~/."${file}" ]
+  then
+    if [ -h ~/."${file}" ]
+    then
+      rm ~/."${file}"
+    else
+      mv ~/."${file}" ~/."${file}.old"
+    fi
+  fi
+  ln -s "${dir}/${file}" ~/."${file}"
 done

git/install

@@ -1,6 +1,17 @@
 #! /usr/bin/env bash
 
+dir="$(dirname $(readlink -f "${0}"))"
+
 for file in gitconfig
 do
-  ln -sf "$PWD"/$file ~/.$file
+  if [ -e ~/."${file}" ]
+  then
+    if [ -h ~/."${file}" ]
+    then
+      rm ~/."${file}"
+    else
+      mv ~/."${file}" ~/."${file}.old"
+    fi
+  fi
+  ln -sf "${dir}/${file}" ~/."${file}"
 done

gnome-terminal/gnome-terminal/profiles/Default/%gconf.xml

@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <gconf>
-	<entry name="scrollback_unlimited" mtime="1478193313" type="bool" value="true"/>
-	<entry name="use_theme_colors" mtime="1478193313" type="bool" value="false"/>
-	<entry name="silent_bell" mtime="1478193313" type="bool" value="true"/>
-	<entry name="default_show_menubar" mtime="1478193313" type="bool" value="false"/>
-	<entry name="palette" mtime="1478193313" type="string">
+	<entry name="scrollback_unlimited" mtime="1478802656" type="bool" value="true"/>
+	<entry name="use_theme_colors" mtime="1478802656" type="bool" value="false"/>
+	<entry name="silent_bell" mtime="1478802656" type="bool" value="true"/>
+	<entry name="default_show_menubar" mtime="1478802656" type="bool" value="false"/>
+	<entry name="palette" mtime="1478802656" type="string">
 		<stringvalue>#2E2E34343636:#CCCC00000000:#4E4E9A9A0606:#C4C4A0A00000:#34346565A4A4:#757550507B7B:#060698209A9A:#D3D3D7D7CFCF:#555557575353:#EFEF29292929:#8A8AE2E23434:#FCFCE9E94F4F:#72729F9FCFCF:#ADAD7F7FA8A8:#3434E2E2E2E2:#EEEEEEEEECEC</stringvalue>
 	</entry>
-	<entry name="alternate_screen_scroll" mtime="1478193313" type="bool" value="true"/>
-	<entry name="background_color" mtime="1478193313" type="string">
+	<entry name="alternate_screen_scroll" mtime="1478802656" type="bool" value="true"/>
+	<entry name="background_color" mtime="1478802656" type="string">
 		<stringvalue>#2E2E34343636</stringvalue>
 	</entry>
-	<entry name="visible_name" mtime="1478193313" type="string">
+	<entry name="visible_name" mtime="1478802656" type="string">
 		<stringvalue>Default</stringvalue>
 	</entry>
-	<entry name="bold_color" mtime="1478193313" type="string">
+	<entry name="bold_color" mtime="1478802656" type="string">
 		<stringvalue>#000000000000</stringvalue>
 	</entry>
-	<entry name="foreground_color" mtime="1478193313" type="string">
+	<entry name="foreground_color" mtime="1478802656" type="string">
 		<stringvalue>#FFFFFFFFFFFF</stringvalue>
 	</entry>
 </gconf>

gnome-terminal/install

@@ -1,3 +1,12 @@
 #! /usr/bin/env bash
-rm -rf ~/.gconf/apps/gnome-terminal
+
+if [ -e ~/.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
+fi &&
 ln -sf "$PWD"/gnome-terminal ~/.gconf/apps/gnome-terminal

i3/install

@@ -1,3 +1,14 @@
 #! /usr/bin/env bash
-rm -rf ~/.i3
-ln -sf "$PWD"/i3 ~/.i3
+
+dir="$(dirname $(readlink -f "${0}"))"
+
+if [ -e ~/.i3 ]
+then
+  if [ -h ~/.i3 ]
+  then
+    rm ~/.i3
+  else
+    mv ~/.i3 ~/.i3.old
+  fi
+fi &&
+ln -s "${dir}/i3" ~/.i3

nma/install

@@ -1,4 +1,3 @@
 #! /usr/bin/env bash
 
-sudo cp nma /usr/local/bin
-cp nma.conf ~/.nma.conf
+cp nma /usr/local/bin

nma/nma.conf

@@ -1,3 +0,0 @@
-#APIkey="0"
-#limit=5
-#pinghost="google.fr"

vim/install

@@ -1,9 +1,31 @@
 #! /usr/bin/env bash
 
-ln -sf "$PWD"/vim ~/.vim
-ln -sf "$PWD"/vimrc ~/.vimrc
+dir="$(dirname $(readlink -f "${0}"))"
 
-cd ..
-git submodule init
-git submodule update
-cd vim
+if [ -e ~/.vim ]
+then
+  if [ -h ~/.vim ]
+  then
+    rm ~/.vim
+  else
+    mv ~/.vim ~/.vim.old
+  fi
+fi &&
+ln -sf "${dir}/vim" ~/.vim &&
+
+if [ -e ~/.vimrc ]
+then
+  if [ -h ~/.vimrc ]
+  then
+    rm ~/.vimrc
+  else
+    mv ~/.vimrc ~/.vimrc.old
+  fi
+fi &&
+ln -sf "${dir}/vimrc" ~/.vimrc &&
+
+(
+  cd "${dir}" &&
+  git submodule init &&
+  git submodule update
+)