From 4c4737d38e10e76f194a9316d12867e72000eb5d Mon Sep 17 00:00:00 2001 From: Abra Date: Mon, 4 Sep 2017 03:04:59 +0400 Subject: [PATCH] upgrade yo --- .gitconfig | 2 -- .zprezto/runcoms/zalias | 30 +++++++++++++++++++++++++++--- .zprezto/runcoms/zlogout | 7 ------- .zprezto/runcoms/zshrc | 6 ++---- 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/.gitconfig b/.gitconfig index 79460ba..28befc6 100644 --- a/.gitconfig +++ b/.gitconfig @@ -4,7 +4,5 @@ [core] autocrlf = input excludesfile = /Users/abra/.gitignore_global -[credential] - helper = osxkeychain [push] default = simple diff --git a/.zprezto/runcoms/zalias b/.zprezto/runcoms/zalias index 1dd44be..06607ae 100644 --- a/.zprezto/runcoms/zalias +++ b/.zprezto/runcoms/zalias @@ -16,7 +16,7 @@ alias ma="git5 mail -m" alias push="git5 submit -xy" # alias push="git submit -xy" alias dc="a && c \"dummy comment\"" -alias dcp="a; dc; git push" +# alias dcp="a; dc; git push" alias zshconfig="subl ~/.zshrc" alias zshreload="exec zsh" @@ -52,6 +52,30 @@ alias -g LATEST='*(om[1])' #alias revs="ssh abra0 'tail -f -n0 ~/reverse_shell' | tee -a .rem_history| zsh -s" #alias nika_pop="echo \"afplay ~/tmp/nika.mp3\" > ~/reverse_shell" -publish() { - rsyncc $@ dedi:/var/www/abra.me/pub/ +function publish() { + rsyncc $@ "dedi:/var/www/abra.me/list/" +} + +function publishwhere() { + rsyncc ${@:2} "dedi:/var/www/abra.me/$1" +} + +function twitch() { + local arg=${@:2} + local arg=${arg:-best} + livestreamer "http://www.twitch.tv/$1" $arg +} + +function dcp() { + local arg=$@ + + if [[ -z $arg ]]; then + local arg="$(whoami) at $(date)" + fi + + a || exit + + git commit -m "$arg" || exit + + git push || exit } \ No newline at end of file diff --git a/.zprezto/runcoms/zlogout b/.zprezto/runcoms/zlogout index 7c27e88..21616f8 100644 --- a/.zprezto/runcoms/zlogout +++ b/.zprezto/runcoms/zlogout @@ -4,10 +4,3 @@ # Authors: # Sorin Ionescu # - -# Print the message. -cat <<-EOF - -Thank you. Come again! - -- Dr. Apu Nahasapeemapetilon -EOF diff --git a/.zprezto/runcoms/zshrc b/.zprezto/runcoms/zshrc index 15f3b93..16dfae1 100644 --- a/.zprezto/runcoms/zshrc +++ b/.zprezto/runcoms/zshrc @@ -58,9 +58,7 @@ function .g-init() { .g remote add origin ssh://dedi/var/www/git.abra.me/dot.git } -function twitch() { - livestreamer "http://www.twitch.tv/$1" ${@:2} -} + function is_local() { [[ $(hostname) == "abra0.local" ]] @@ -85,7 +83,7 @@ function latest() { # ----------------------------------- END ALIASES -------------------------------------------------- export EDITOR=/usr/bin/vim -export PATH=$PATH:$HOME/bin:$HOME/brew/bin +export PATH=$HOME/brew/bin:$HOME/bin:$PATH export DYLD_LIBRARY_PATH="/Developer/NVIDIA/CUDA-8.0/lib:/usr/local/cuda/lib" # added by travis gem