From ade22498e42237874b8b3af38e094144e59c0686 Mon Sep 17 00:00:00 2001 From: Charles Calvert Date: Tue, 4 Oct 2011 22:36:33 -0400 Subject: [PATCH 1/5] Changed default colors to ir_dark --- vim/vimrc_settings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/vimrc_settings b/vim/vimrc_settings index 1b0c6515c..6807a525d 100644 --- a/vim/vimrc_settings +++ b/vim/vimrc_settings @@ -74,7 +74,7 @@ set dir=~/.vim_tmp "set t_Co=256 " 256 colors set background=dark syntax on " syntax highlighting -colorscheme railscasts +colorscheme ir_dark set fo-=r " do not insert a comment leader after an enter, (no work, fix!!) From 6a529ca27383fa741d5163c25e6b997ad47f4458 Mon Sep 17 00:00:00 2001 From: Charles Calvert Date: Tue, 4 Oct 2011 22:50:27 -0400 Subject: [PATCH 2/5] Modified git URL to allow using ssh aliases for the host instead of harcoding github.com. --- get.vimfiles.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/get.vimfiles.sh b/get.vimfiles.sh index c67468714..edb495495 100755 --- a/get.vimfiles.sh +++ b/get.vimfiles.sh @@ -7,12 +7,15 @@ # # curl https://raw.github.com/coderifous/dotfiles/master/get.vimfiles.sh | sh -# If you have a fork, change this variable. The other ones should be fine. -REPO_OWNER="coderifous" - - -REPO_NAME="dotfiles" -GIT_REPO_URL="git://github.com/$REPO_OWNER/$REPO_NAME.git" +# Put your github username on the next line +REPO_OWNER="ccalvert" +# REPO_HOST will generally be "github.com", but may be changed to something else +# if you're using a different git hosting service or if you have configured +# an alias in ~/.ssh/config, e.g. because you're using multiple identities. +REPO_HOST="github-personal" +# The next line should contain the name of the repository. +REPO_NAME="dotfiles-1" +GIT_REPO_URL="git@$REPO_HOST:$REPO_OWNER/$REPO_NAME.git" echo -e "\033[32mDownloading repository." echo -e "\033[0m" From 2d91abe1ee43d0e5de0d681c7c393e65011dcfb7 Mon Sep 17 00:00:00 2001 From: Charles Calvert Date: Wed, 5 Oct 2011 22:18:33 -0400 Subject: [PATCH 3/5] Returned the scripts variables to their original values. --- get.vimfiles.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/get.vimfiles.sh b/get.vimfiles.sh index edb495495..9819aa957 100755 --- a/get.vimfiles.sh +++ b/get.vimfiles.sh @@ -8,13 +8,13 @@ # curl https://raw.github.com/coderifous/dotfiles/master/get.vimfiles.sh | sh # Put your github username on the next line -REPO_OWNER="ccalvert" +REPO_OWNER="coderifous" # REPO_HOST will generally be "github.com", but may be changed to something else # if you're using a different git hosting service or if you have configured # an alias in ~/.ssh/config, e.g. because you're using multiple identities. -REPO_HOST="github-personal" +REPO_HOST="github.com" # The next line should contain the name of the repository. -REPO_NAME="dotfiles-1" +REPO_NAME="dotfiles" GIT_REPO_URL="git@$REPO_HOST:$REPO_OWNER/$REPO_NAME.git" echo -e "\033[32mDownloading repository." From 73636b4fe82a1cf4e9a5e66447629ea387a8972b Mon Sep 17 00:00:00 2001 From: Charles Calvert Date: Tue, 25 Oct 2011 23:24:51 -0400 Subject: [PATCH 4/5] Combined variables down to two, per request from coderifous. Couldnt eliminate the separate REPO_NAME variable, because its needed elsewhere. Added ability to back up existing .vim, .vimrc and .gvimrc files before creating symbolic links. --- get.vimfiles.sh | 46 +++++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/get.vimfiles.sh b/get.vimfiles.sh index 9819aa957..7b6867a2b 100755 --- a/get.vimfiles.sh +++ b/get.vimfiles.sh @@ -7,15 +7,10 @@ # # curl https://raw.github.com/coderifous/dotfiles/master/get.vimfiles.sh | sh -# Put your github username on the next line -REPO_OWNER="coderifous" -# REPO_HOST will generally be "github.com", but may be changed to something else -# if you're using a different git hosting service or if you have configured -# an alias in ~/.ssh/config, e.g. because you're using multiple identities. -REPO_HOST="github.com" -# The next line should contain the name of the repository. REPO_NAME="dotfiles" -GIT_REPO_URL="git@$REPO_HOST:$REPO_OWNER/$REPO_NAME.git" +# Replace the hostname, username and repository name as required to use your +# own fork instead of Coderifous's. +GIT_REPO_URL="git@github.com:coderifous/$REPO_NAME.git" echo -e "\033[32mDownloading repository." echo -e "\033[0m" @@ -25,25 +20,46 @@ git clone $GIT_REPO_URL echo echo -e "\033[32mUpdating submodules." echo -e "\033[0m" - +echo "REPO_NAME = $REPO_NAME" cd $REPO_NAME git submodule update --init +backup_file() { + if [ -e $1 ] || [ -L $1 ]; + then + bakext=".bak" + bakfile=$1$bakext + echo -e "\033[32mBacking up \"$1\" to \"$bakfile\"." + echo -e "\033[0m" + mv $1 $bakfile + fi +} + echo echo -e "\033[32mCreating dotfile links in home dir." echo -e "\033[0m" VIMHOME=`pwd`"/vim" -ln -s $VIMHOME ~/.vim -ln -s ~/.vim/vimrc ~/.vimrc +backup_file ~/.vim +ln -s $VIMHOME ~/.vim + +backup_file ~/.vimrc +ln -s ~/.vim/vimrc ~/.vimrc + +backup_file ~/.gvimrc ln -s ~/.vim/gvimrc ~/.gvimrc -echo -echo -e "\033[32mCreating ~/.vim_tmp: where vim is configured to store temporary files." -echo -e "\033[0m" -mkdir ~/.vim_tmp +if [ ! -d ~/.vim_tmp ]; +then + echo + echo -e "\033[32mCreating ~/.vim_tmp: where vim is configured to store temporary files." + echo -e "\033[0m" + mkdir ~/.vim_tmp +fi + +#end echo echo -e "\033[32mVim dotfiles installed!" From 460bbf35707be15955ed73053b12cdf7df052388 Mon Sep 17 00:00:00 2001 From: Charles Calvert Date: Fri, 27 Jul 2012 22:31:42 -0400 Subject: [PATCH 5/5] Reverted color scheme to coderifous' default on the master branch. --- vim/vimrc_settings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/vimrc_settings b/vim/vimrc_settings index 6807a525d..1b0c6515c 100644 --- a/vim/vimrc_settings +++ b/vim/vimrc_settings @@ -74,7 +74,7 @@ set dir=~/.vim_tmp "set t_Co=256 " 256 colors set background=dark syntax on " syntax highlighting -colorscheme ir_dark +colorscheme railscasts set fo-=r " do not insert a comment leader after an enter, (no work, fix!!)