From c88d2bb5403c38dd90b6106e4819cdd83aab965d Mon Sep 17 00:00:00 2001 From: Austen Date: Wed, 30 Jul 2014 23:17:48 -0400 Subject: [PATCH 1/2] Added -r flag in initify and cinitify to not auto-pull --- bashrc | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/bashrc b/bashrc index f740cc1..5ab6f88 100644 --- a/bashrc +++ b/bashrc @@ -161,9 +161,13 @@ function cinitify(){ git remote add oOrigin git@10.0.1.200:$1/$2.git git remote add oHttps https://10.0.1.200/gitlab/$1/$2.git git remote -v - echo -n "Pull from: " - read from - git pull $FROM + while getopts ":r" VALUE "$@"; do + if [ ! "$VALUE" = "r" ] ; then + echo -n "Pull from: " + read from + git pull $FROM + fi + done git co master } export -f cinitify @@ -175,20 +179,17 @@ function initify(){ git remote add oOrigin git@10.0.1.200:$1/$2.git git remote add oHttps https://10.0.1.200/gitlab/$1/$2.git git remote -v - echo -n "Pull from: " - read from - git pull $FROM + while getopts ":r" VALUE "$@"; do + if [ ! "$VALUE" = "r" ] ; then + echo -n "Pull from: " + read from + git pull $FROM + fi + done git co master } export -f initify - - - - - - - #Color definitions txtblk='\[\e[0;30m\]' # Black - Regular txtred='\[\e[0;31m\]' # Red From 700108194824d099ce0052c820ca05f2acca0cd9 Mon Sep 17 00:00:00 2001 From: Austen Date: Thu, 31 Jul 2014 00:08:14 -0400 Subject: [PATCH 2/2] Commented vimrc and added silent! to fruity coloscheme import --- vimrc | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/vimrc b/vimrc index 3fbe354..cb0e59c 100644 --- a/vimrc +++ b/vimrc @@ -201,39 +201,71 @@ call vundle#rc() "Bundle 'msanders/snipmate.vim' "Bundle 'vim-scripts/YankRing.vim' "Bundle 'majutsushi/tagbar' +"Bundle 'mbbill/undotree' Bundle 'gmarik/vundle' + "Required: manages all bundles | https://github.com/gmarik/vundle Bundle 'Chiel92/vim-autoformat' + "Adds autoformat command | https://github.com/Chiel92/vim-autoformat Bundle 'tpope/vim-surround' + "Surround selection in ({\"' or HTML tags | https://github.com/tpope/vim-surround Bundle 'scrooloose/syntastic' + "Syntax checker | https://github.com/scrooloose/syntastic Bundle 'Shougo/neocomplcache.vim' + "Tab complete everything | https://github.com/Shougo/neocomplcache.vim Bundle 'nathanaelkane/vim-indent-guides' + "Indentation guides | https://github.com/nathanaelkane/vim-indent-guides Bundle 'elzr/vim-json' + "JSON highlighting | https://github.com/elzr/vim-json Bundle 'groenewege/vim-less' + "LESS highlighting | https://github.com/groenewege/vim-less Bundle 'pangloss/vim-javascript' + "JS syntax and indentation | https://github.com/pangloss/vim-javascript Bundle 'briancollins/vim-jst' + "Actually, I do not know what this does | https://github.com/briancollins/vim-jst Bundle 'kchmck/vim-coffee-script' + "Coffeescript syntax | https://github.com/kchmck/vim-coffee-script Bundle 'Lokaltog/powerline-fonts' + "Better powerline fonts | https://github.com/Lokaltog/powerline-fonts Bundle 'bling/vim-airline' + "Bottom status bar | https://github.com/bling/vim-airline Bundle 'terryma/vim-multiple-cursors' + "Multicursor functionality like Coda | https://github.com/terryma/vim-multiple-cursors Bundle 'scrooloose/nerdtree' + "File browser | https://github.com/scrooloose/nerdtree Bundle 'altercation/vim-colors-solarized' + "Theme | https://github.com/altercation/vim-colors-solarized Bundle 'spf13/vim-colors' + "Theme pack | https://github.com/spf13/vim-colors Bundle 'spf13/PIV' + "PHP tools | https://github.com/spf13/PIV Bundle 'vim-scripts/AutoTag' + "Generates taglist with ctags | https://github.com/vim-scripts/AutoTag Bundle 'Lokaltog/vim-easymotion' + "Move around quickly in a document | https://github.com/Lokaltog/vim-easymotion Bundle 'sjl/gundo.vim' + "Visual undo | https://github.com/sjl/gundo.vim Bundle 'tommcdo/vim-exchange' + "Exchange two selections of text | https://github.com/tommcdo/vim-exchange Bundle 'tpope/vim-repeat' + "Repeat last tpope command with . | https://github.com/tpope/vim-repeat Bundle 'tpope/vim-commentary' -Bundle 'mbbill/undotree' + "Comment selection | https://github.com/tpope/vim-commentary Bundle 'vim-php/vim-php-refactoring' + "PHP refactoring | https://github.com/vim-php/vim-php-refactoring Bundle 'tpope/vim-fugitive' + "Great Vim-Git compatibility | https://github.com/tpope/vim-fugitive Bundle 'tpope/vim-unimpaired' + "Bracket shortcuts | https://github.com/tpope/vim-unimpaired Bundle 'kien/ctrlp.vim' -Bundle 'godlygeek/tabular' -Bundle 'tpope/vim-abolish' + "Fuzzy file search | https://github.com/kien/ctrlp.vim Bundle 'tacahiroy/ctrlp-funky' + "Fuzzy function search | https://github.com/tacahiroy/ctrlp-funky +Bundle 'godlygeek/tabular' + "Quickly make tables in vim | https://github.com/godlygeek/tabular +Bundle 'tpope/vim-abolish' + "Better abbrivation | https://github.com/tpope/vim-abolish Bundle 'godlygeek/csapprox' + "256 color vim in terminal | https://github.com/godlygeek/csapprox filetype plugin indent on if exists("+undofile") if isdirectory($HOME . '/.vim/undo')==0 @@ -261,6 +293,6 @@ else endif "colorscheme torte endif -colorscheme fruity +silent! colorscheme fruity nnoremap W :%s/\s\+$//:let @/='' nnoremap H *:AckFromSearch!