Improved config setup via install.sh

.gitignore

@@ -1,5 +1,4 @@
 *.swp
 *.swo
-vim/bundle
+config/.vim/autoload
-vim/autoload
+config/.vim/plugged
-vim/plugged

install.sh

@@ -6,7 +6,8 @@ else
     SCRIPTS=${HOME}/devel/scripts
 fi
 
-find ${SCRIPTS}/config -name .\* -type f -exec ln \{\} . \;
+find ${SCRIPTS}/config -name .\* -type f -exec ln -i \{\} . \;
+find ${SCRIPTS}/config -name .\* -type d -exec ln -i -s \{\} . \;
 
 #mkdir -p .vim/autoload .vim/bundle
 curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
@@ -15,4 +16,12 @@ curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
 # git clone https://github.com/VundleVim/Vundle.vim.git .vim/bundle/Vundle.vim
 
 
-# [ -x ~/.bashrc.vahagn ] && source ~/.bashrc.vahagn
+#
+# Add .bashrc.vahagn to .bashrc
+#
+grep .bashrc.vahagn .bashrc
+if [ $? != 0 ]; then
+    printf "# Load Vahagn's standard environment.\n"
+    printf "[ -f ~/.bashrc.vahagn ] && source ~/.bashrc.vahagn\n" >> .bashrc
+    printf "[ -f ~/.bashrc.local ] && source ~/.bashrc.local\n" >> .bashrc
+fi