X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fsetup_rc;h=a998575b5f13e2e089763a0ec7092f1e15a83c3e;hb=7ddf095f187ca60d9a70fb83b2bc3c2b6d91f088;hp=b80e28798e644c791fa6b36ea3984d776c97a165;hpb=cc7d7d67a7e97060e13d1fcd1bdee2ed64969595;p=clearscm.git

diff --git a/rc/setup_rc b/rc/setup_rc
index b80e287..a998575 100755
--- a/rc/setup_rc
+++ b/rc/setup_rc
@@ -2,11 +2,11 @@
 ################################################################################
 #
 # File:         $RCSfile: setup_rc,v $
-# Revision:	$Revision: 1.6 $
+# Revision:     $Revision: 1.6 $
 # Description:  This script sets up my rc scripts
 # Author:       Andrew@DeFaria.com
 # Created:      Thu Feb 16 07:34:32 PST 2006
-# Modified:	$Date: 2011/12/14 22:28:59 $
+# Modified:     $Date: 2011/12/14 22:28:59 $
 # Language:     bash
 #
 # (c) Copyright 2006, Andrew@DeFaria.com, all rights reserved
@@ -26,6 +26,7 @@ function ReplaceFile {
   fi
 
   if [ ! -h "$dest" ]; then
+    echo "Linking $source -> $dest"
     ln -s "$source" "$dest"
   fi
 } # ReplaceFile
@@ -44,6 +45,7 @@ function ReplaceDir {
   fi
 
   if [ ! -h "$dest" ]; then
+    echo "Linking $source -> $dest"
     ln -s "$source" "$dest"
   fi
 } # ReplaceDir
@@ -53,25 +55,28 @@ if [ ! -d $HOME/.rc ]; then
   exit 1
 fi
 
-# Check to see if we were already setup
-symlink=$(stat -c %N ~/.bashrc | awk '{print $2}')
-
-if [ "$symlink" = "->" ]; then
-  to=$(stat -c %N ~/.bashrc | awk '{print $NF}')
+function CopyFile {
+  dest=$1
+  source=$2
 
-  if [[ "$to" =~ .rc\/bash_login ]]; then
-    echo "Already setup"
-    exit
+  if [ -f "$dest" ]; then
+    echo "Saving your old $dest as $dest.save..."
+    mv "$dest" "$dest.save"
   fi
-fi
+
+  cp "$source" "$dest"
+} # CopyFile
 
 ReplaceFile "$HOME/.Xdefaults"	  "$HOME/.rc/Xdefaults"
 ReplaceFile "$HOME/.bash_login"	  "$HOME/.rc/bash_login"
-ReplaceFile "$HOME/.bashrc"	      "$HOME/.rc/bash_login"
-ReplaceFile "$HOME/.inputrc"	    "$HOME/.rc/inputrc"
-ReplaceFile "$HOME/.vimrc"	      "$HOME/.rc/vimrc"
-ReplaceDir  "$HOME/.xemacs"	      "$HOME/.rc/xemacs"
-ReplaceFile "$HOME/.ssh/config"	  "$HOME/.rc/sshconfig"
+ReplaceFile "$HOME/.bashrc"	  "$HOME/.rc/bash_login"
+ReplaceFile "$HOME/.inputrc"	  "$HOME/.rc/inputrc"
+ReplaceFile "$HOME/.vimrc"	  "$HOME/.rc/vimrc"
+ReplaceDir  "$HOME/.xemacs"	  "$HOME/.rc/xemacs"
 ReplaceFile "$HOME/.perlcriticrc" "$HOME/.rc/perlcriticrc"
 ReplaceFile "$HOME/.perltidyrc"   "$HOME/.rc/perltidyrc"
 ReplaceFile "$HOME/.gitconfig"    "$HOME/.rc/gitconfig"
+ReplaceFile "$HOME/.gitignore"    "$HOME/.rc/gitignore"
+
+# Ssh is picky about the ownership of this file so copy it.
+CopyFile "$HOME/.ssh/config"	  "$HOME/.rc/sshconfig"