nicole/config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated path.

Browse source
This commit is contained in:
Nicole Tietz-Sokolskaya 2012-01-23 15:38:31 -05:00
commit 201b63434e
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config.sh
View file

@ -7,9 +7,13 @@ rm -f .bashrc
ln -s ~/Repositories/config/profile .profile ln -s ~/Repositories/config/profile .profile
ln -s ~/Repositories/config/bashrc .bashrc ln -s ~/Repositories/config/bashrc .bashrc
rm -f .screenrf rm -f .screenrc
ln -s ~/Repositories/config/screenrc .screenrc ln -s ~/Repositories/config/screenrc .screenrc
rm -f .vimrc rm -f .vimrc
ln -s ~/Repositories/config/vimrc .vimrc ln -s ~/Repositories/config/vimrc .vimrc
# set up the default branch for git
git config --global branch.master.remote origin
git config --global branch.master.merge refs/heads/master

5
profile
View file

@ -42,7 +42,12 @@ export HISTCONTROL=ignoredups
# disable messaging # disable messaging
mesg n mesg n
<<<<<<< HEAD
# set the path for Hadoop # set the path for Hadoop
export HADOOP_HOME=~/hadoop/hadoop-0.20.2/ export HADOOP_HOME=~/hadoop/hadoop-0.20.2/
export PATH=$PATH:$HADOOP_HOME/bin export PATH=$PATH:$HADOOP_HOME/bin
=======
# add the rubygem location
export PATH=$PATH:/var/lib/gems/1.8/bin/
>>>>>>> 6fd6398cec6e7bef7c00bef10fdc4ee45a615301