From d27050173eee21f10935f74c11bc66dd9b974721 Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Mon, 24 Aug 2015 21:43:29 +0000 Subject: [PATCH] Changes --- scripts/sync.sh | 10 ++++++---- shells/zshrc | 28 +++++++++++++++++++++------- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/scripts/sync.sh b/scripts/sync.sh index b592401..8a3c037 100755 --- a/scripts/sync.sh +++ b/scripts/sync.sh @@ -51,7 +51,7 @@ while getopts ":hbsdpcw" VALUE "$@"; do rm -rf ~/.antigen fi echo "Syncing config files" - if which trash >/dev/null; then + if command -v trash 2>&1 /dev/null; then trash ~/.gitconfig ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.bashrc ~/.pylintrc ~/.zsh ~/.zshrc ~/.tmux.conf ~/.config/liquidpromptrc else rm ~/.gitconfig ~/.vimperatorrc ~/.vimperator/colors/vimPgray.vimp ~/.bashrc ~/.pylintrc ~/.zsh ~/.zshrc ~/.tmux.conf ~/.config/liquidpromptrc @@ -65,8 +65,8 @@ while getopts ":hbsdpcw" VALUE "$@"; do ln -s $ABSPATH/git/gitconfig ~/.gitconfig ln -s $ABSPATH/shells/bashrc ~/.bashrc ln -s $ABSPATH/zsh ~/.zsh - if which git >/dev/null; then - if which zsh >/dev/null; then + if command -v git 2>&1 >/dev/null; then + if command -v zsh 2>&1 >/dev/null; then ln -s $ABSPATH/shells/zshrc ~/.zshrc if [ ! -d ~/.antigen ] ; then git clone https://github.com/zsh-users/antigen ~/.antigen @@ -78,11 +78,13 @@ while getopts ":hbsdpcw" VALUE "$@"; do git clone https://github.com/stonewareslord/fzf.git ~/.fzf ~/.fzf/install -y fi + else + echo "No git! Not installing fzf or antigen" fi mkdir -p ~/.config ln -s $ABSPATH/shells/liquidpromptrc ~/.config/liquidpromptrc if [ "$(uname)" != "Darwin" ]; then - if which trash >/dev/null; then + if command -v trash 2>&1 >/dev/null; then trash ~/.i3/config ~/.i3/run.sh ~/.Xmodmap ~/.xsession ~/.config/synapse/gtkrc ~/.Xresources else rm ~/.i3/config ~/.i3/run.sh ~/.Xmodmap ~/.xsession ~/.config/synapse/gtkrc ~/.Xresources diff --git a/shells/zshrc b/shells/zshrc index 659cac4..43ed496 100644 --- a/shells/zshrc +++ b/shells/zshrc @@ -2,14 +2,8 @@ export HISTFILE=$HOME/.zsh_history for config (~/.zsh/*.zsh) source $config ZSH_THEME="af-magic" source "$HOME/.antigen/antigen.zsh" -# Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" -COMPLETION_WAITING_DOTS="true" -# Uncomment the following line if you want to change the command execution time -# stamp shown in the history command output. -# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" -HIST_STAMPS="dd.mm.yyyy" setopt APPEND_HISTORY +HIST_STAMPS="dd.mm.yyyy" HISTSIZE=12000 SAVEHIST=10000000 setopt INTERACTIVECOMMENTS @@ -215,6 +209,26 @@ function por(){ *) echo "Opts: use make unmask mask accept_keywords" esac } +function ncsu-git-init(){ + branch=$(git remote -v | ag '^origin\s+' | sed -e 's/^origin\s*//' | cut -d\ -f1 | sed -e 's/^.\+\///' -e 's/\.git$//' | head -n1 | sha512sum | cut -d\ -f1) + echo Branch will be: $branch + remote="gcrypt::git@github.ncsu.edu:agadler/a86a0f8757772be2ec617b395a0716679bfce51c1bfdeb8da6127feebd84facde645e9e30188318344eb458f5834e3d86800.git#$branch" + echo -n "Add $remote? " + read a + git remote add ncsu $remote + git config remote.ncsu.gcrypt-participants "CCDFE3F1" + echo -n "Push? " + read a + git push ncsu --all + git push ncsu --tags +} +function ncsu-git-clone(){ + branch=$(echo $1 | sha512sum | cut -d\ -f1) + echo Branch will be: $branch + echo -n "Continue?" + read a + git clone "gcrypt::git@github.ncsu.edu:agadler/a86a0f8757772be2ec617b395a0716679bfce51c1bfdeb8da6127feebd84facde645e9e30188318344eb458f5834e3d86800.git#$branch" $1 +} function k(){ #More than 1 arguement if [[ $# > 1 ]] ; then