Merge branch 'master' of github.com:ardentsword/dotfiles

bash/.bashrc

@@ -48,7 +48,7 @@ esac
 # uncomment for a colored prompt, if the terminal has the capability; turned
 # off by default to not distract the user: the focus in a terminal window
 # should be on the output of commands, not on the prompt
-#force_color_prompt=yes
+force_color_prompt=yes
 
 if [ -n "$force_color_prompt" ]; then
     if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
@@ -92,7 +92,7 @@ if [ "$color_prompt" = yes ]; then
     # git in bash
     PROMPT_COMMAND='__git_ps1_new "'$PS1FRONT'" "'$PS1BACK'";'
 else
-    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+    PS1="$RS${debian_chroot:+($debian_chroot)}\u@\h:\w\$ "
     PS2="> "
 fi
 unset color_prompt force_color_prompt

profile/.profile

@@ -8,9 +8,6 @@
 # for ssh logins, install and configure the libpam-umask package.
 #umask 022
 
-# set TERM to xterm-color to allow colors in the terminal
-TERM=xterm-color
-
 # if running bash
 if [ -n "$BASH_VERSION" ]; then
     # include .bashrc if it exists

remove-stow-conflicts.sh

@@ -0,0 +1,26 @@
+#! /bin/sh
+
+# remove-stow-conflicts -- 
+#		remove all conflicts detected by stow, but that are
+#		already links to previous stow packages... 
+
+# $Id: remove-stow-conflicts,v 1.1 1997/10/17 21:19:03 cdua Exp cdua $
+# Carlos Duarte, 970903/971017
+
+stow -nvc $* 2>&1 \
+  | sed -n '/^CONFLICT/s/^.*vs\. //p' \
+  | while read i; do 
+	test -L $i || {
+		echo Skipping $i ...
+		continue
+	}
+
+	point_to=`ls -ald $i | awk '{print $NF}'`
+
+	#echo $i points to $point_to
+	case $point_to in 
+	..*/stow/* | ..*/?stow/* | stow/* ) 
+		echo "Deleting $i (link to $point_to)"...
+		rm -f $i
+	esac
+done