Fix zsh check/and others

This commit is contained in:
Kevin Cotugno 2017-12-15 14:02:16 -08:00
parent d15a5cf39f
commit 7c8f80ab2e

24
profile
View File

@ -1,8 +1,4 @@
if [[ -d "$HOME/dev" ]]; then if [[ -n "$(echo $SHELL | grep zsh)" ]]; then
export DEVPATH="$HOME/dev"
fi
if [[ -n "$ZSH_VERSION" ]]; then
export ZSH="$HOME/.oh-my-zsh" export ZSH="$HOME/.oh-my-zsh"
ZSH_THEME="jispwoso" ZSH_THEME="jispwoso"
@ -11,10 +7,10 @@ if [[ -n "$ZSH_VERSION" ]]; then
source "$ZSH/oh-my-zsh.sh" source "$ZSH/oh-my-zsh.sh"
fi fi
if [[ -d "$HOME/.rvm" ]]; then if [[ -d "$HOME/devel" ]]; then
export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting export DEVPATH="$HOME/devel"
else
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function* export DEVPATH="$HOME"
fi fi
if [[ -d "$DEVPATH/android/android-sdk" ]]; then if [[ -d "$DEVPATH/android/android-sdk" ]]; then
@ -44,14 +40,10 @@ function passgen () {
local tr2="[:lower:]" local tr2="[:lower:]"
fi fi
cat /dev/urandom | base64 | head -c "$len" | tr -d "\n" | \ cat /dev/urandom | base64 | head -c $len | tr -d "\n" | \
tr "$tr1" "$tr2" && echo tr "$tr1" "$tr2" && echo
} }
if [[ -f "$HOME/.ssh-sentinel.sh" ]]; then
source "$HOME/.ssh-sentinel.sh"
fi
which nvim &> /dev/null which nvim &> /dev/null
neovim="$?" neovim="$?"
@ -66,6 +58,10 @@ else
export EDITOR="vi" export EDITOR="vi"
fi fi
if [[ -f "$HOME/.ssh-sentinel.sh" ]]; then
source "$HOME/.ssh-sentinel.sh"
fi
alias e="$EDITOR" alias e="$EDITOR"
alias s="du -sh" alias s="du -sh"