X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=zsh%2Fzshrc;h=3c07c11514830479b4d77dcf2d96350ba6bfcf11;hb=3a9109b5afed134cd50d9e89a5a38eab84bbfdf7;hp=045e33c74f4288fcb057269bb2d1fa49c91191c1;hpb=dfdef82ccf5910f8efcde571f118da760cc63a23;p=dotfiles.git

diff --git a/zsh/zshrc b/zsh/zshrc
index 045e33c..3c07c11 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -90,7 +90,7 @@ alias ln='ln -i'
 #alias svn='colorsvn'
 alias sed='/usr/local/bin/gsed'
 
-alias 'git log'='git log  --oneline --graph --all --color --decorate --abbrev-commit'
+alias 'git-log'='git log  --oneline --graph --all --color --decorate --abbrev-commit'
 
 
 
@@ -231,3 +231,44 @@ alias tw='open -a /Applications/TextWrangler.app/'
 #fi
 export LANG='en_US.UTF-8'
 export LC_ALL="en_US.UTF-8"
+
+lftp-cp() {
+
+    server='cmbu-ftp.cisco.com'
+    user='cmbu'
+    pass='cisco123!@#'
+    home='/FTPServer/users/peli3'
+    dir=`date +%m%d`
+
+    localfile=$1;
+    remotefile=${home}/${dir}/$2;
+
+    echo "copy ${localfile} to ftp://${server}${remotefile}"
+    lftp -e "mkdir ${home}/${dir}; put ${localfile} -o  ${remotefile}; bye" -u $user,$pass $server
+}
+merge_logs() {
+    ls -rl jabber.log*  | awk '{print $9}' | Xargs cat >> full.log
+}
+
+export MANPATH=$MANPATH:/usr/local/man
+
+
+## vim YouCompleteMe
+# https://github.com/Valloric/YouCompleteMe/issues/18
+#export DYLD_FORCE_FLAT_NAMESPACE=1
+
+## appended by cpan initializaion
+PATH="/Users/peli3/perl5/bin${PATH:+:${PATH}}"; export PATH;
+PERL5LIB="/Users/peli3/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LIB;
+PERL_LOCAL_LIB_ROOT="/Users/peli3/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT;
+PERL_MB_OPT="--install_base \"/Users/peli3/perl5\""; export PERL_MB_OPT;
+PERL_MM_OPT="INSTALL_BASE=/Users/peli3/perl5"; export PERL_MM_OPT;
+
+
+
+
+export MANPATH=$MANPATH:${HOME}/perl5/man
+
+export PATH=$PATH:"${HOME}/scripts"
+## hunspell path
+export DICPATH="/usr/local/share/hunspell/"