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

diff --git a/install-symlinks.sh b/install-symlinks.sh
index ebb21b7..820d5b3 100755
--- a/install-symlinks.sh
+++ b/install-symlinks.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 # install-symlinks.sh
@@ -15,25 +15,20 @@ die() {
 	exit 1
 }
 
-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
+for file in .bashrc .ssh .profile; do
+    if [ -f ../$file ]; then
+        if [ -L ../$file ]; then
+            :
+        else
+            echo "moving old $file to $file-old"
+            mv -f ../$file ../$file-old
+            if [ $file == .ssh ]; then
+                copy_ssh_old=1
+            fi
+        fi
     fi
-fi
+done
 
 BASEDIR=`pwd`
 for file in ${BASEDIR}/.[^.]*; do
@@ -46,6 +41,7 @@ for file in ${BASEDIR}/.[^.]*; do
 	# skip files which we don't want to link
 	[ "${basefile}" == ".git" ] && continue
 	[ "${basefile}" == ".gitignore" ] && continue
+	#[ "${basefile}" == ".ssh" ] && continue
 
 	pushd .. > /dev/null
 	if [ -L ${basefile} ]; then
@@ -67,5 +63,5 @@ 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
+    chmod 600 ../.ssh/*
 fi