X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=install-symlinks.sh;h=ebb21b7675de0620d44944fe6accd1948445b4ba;hb=38d636c5132a46528ac843cae2ca09b5566e2612;hp=41bda44f2b8504add2cdc3997999c67cd3737a2c;hpb=993671d30b462c6ce8158e690087efa37c02b7da;p=cmccabe-etc

diff --git a/install-symlinks.sh b/install-symlinks.sh
index 41bda44..ebb21b7 100755
--- a/install-symlinks.sh
+++ b/install-symlinks.sh
@@ -15,8 +15,27 @@ die() {
 	exit 1
 }
 
-FULLPATH=`readlink -f $0`
-BASEDIR=`dirname ${FULLPATH}`
+if [ -f ../.bashrc ]; then
+    if [ -L ../.bashrc ]; then
+        :
+    else
+        echo "moving old .bashrc to .bashrc-old"
+        mv -f ../.bashrc ../.bashrc-old
+    fi
+fi
+
+copy_ssh_old=0
+if [ -d ../.ssh ]; then
+    if [ -L ../.ssh ]; then
+        :
+    else
+        echo "moving old .ssh to .ssh-old"
+        mv -f ../.ssh ../.ssh-old
+        copy_ssh_old=1
+    fi
+fi
+
+BASEDIR=`pwd`
 for file in ${BASEDIR}/.[^.]*; do
 	# get base file name, like ".gitconfig"
 	basefile=`basename ${file}`
@@ -25,9 +44,8 @@ for file in ${BASEDIR}/.[^.]*; do
 	relfile=`echo ${file} | sed 's_.*/\([^/]*/[^/]*\)$_\1_'`
 
 	# skip files which we don't want to link
-	if [ "${basefile}" == ".git" ]; then
-		continue;
-	fi
+	[ "${basefile}" == ".git" ] && continue
+	[ "${basefile}" == ".gitignore" ] && continue
 
 	pushd .. > /dev/null
 	if [ -L ${basefile} ]; then
@@ -44,3 +62,10 @@ for file in ${BASEDIR}/.[^.]*; do
 	fi
 	popd > /dev/null
 done
+
+if [ $copy_ssh_old -eq 1 ]; then
+    echo "copying files from .ssh-old to .ssh"
+    cp -f ../.ssh-old/* ../.ssh
+    echo "chmod 600 ../.ssh/config"
+    chmod 600 ../.ssh/config
+fi