sjs/config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move zshenv into zshrc

Browse source
This commit is contained in:
Sami Samhuri 2013-11-09 23:05:08 -08:00
parent 8e21e0522f
commit d8e7452d3d
3 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
init.sh
View file

@ -14,19 +14,23 @@ else
fi fi
link_config() { link_config() {
file="$1" SRC="$1"
if [ -e "${HOME}/.$file" ]; then NAME=$(basename "$SRC")
DEST="${HOME}/.${NAME}"
if [ -e "$DEST" ]; then
echo "Existing file found at ${DEST}, moving to ~/original-dot-files."
mkdir "${HOME}/original-dot-files" >/dev/null 2>/dev/null mkdir "${HOME}/original-dot-files" >/dev/null 2>/dev/null
echo "Existing file found at $HOME/.$file, moving to ~/original-dot-files." mv "$DEST" original-dot-files/
mv ".$file" original-dot-files/
fi fi
ln -s "${CONFIG_PATH}/$file" "${HOME}/.$file" ln -s "$SRC" "$DEST"
} }
cd "$CONFIG_PATH" cd "$CONFIG_PATH"
for file in *; do for FILE in *; do
if [ "$file" != "init.sh" ]; then if [ "$FILE" != "init.sh" ]; then
link_config "$file" link_config "${CONFIG_PATH}/$FILE"
fi fi
done done
link_config "zsh/zshrc"

17
zsh/zshrc
View file

@ -13,7 +13,22 @@ function is_interactive() { [ -t 1 ] }
# 1. Environment Vars # 1. Environment Vars
# =================== # ===================
[ -d /usr/local/riak ] && export RIAK=/usr/local/riak custom_paths=(/sbin /usr/sbin $HOME/bin $HOME/.rbenv/bin /usr/local/android/sdk/tools /usr/local/android/sdk/platform-tools /usr/local/bin /usr/local/share/npm/bin)
for dir in $custom_paths; do
if [[ -d "$dir" ]]; then
path=($dir $path)
fi
done
if [[ -d /Applications/Xcode.app/Contents/Developer/usr/bin ]]; then
path=($path /Applications/Xcode.app/Contents/Developer/usr/bin)
fi
export path
typeset -U path
[[ -d "$HOME/config/zsh" ]] && ZDOTDIR="$HOME/config/zsh"
fpath=($fpath $ZDOTDIR/functions)
typeset -U fpath
# Android SDK # Android SDK
export ANDROID_SDK='/usr/local/android/sdk' export ANDROID_SDK='/usr/local/android/sdk'

19
zshenv
View file

@ -1,19 +0,0 @@
custom_paths=(/sbin /usr/sbin $HOME/bin $HOME/.rbenv/bin /usr/local/android/sdk/tools /usr/local/android/sdk/platform-tools /usr/local/bin /usr/local/share/npm/bin)
for dir in $custom_paths; do
if [[ -d "$dir" ]]; then
path=($dir $path)
fi
done
if [[ -d /Applications/Xcode.app/Contents/Developer/usr/bin ]]; then
path=($path /Applications/Xcode.app/Contents/Developer/usr/bin)
fi
export path
typeset -U path
[[ -d "$HOME/config/zsh" ]] && ZDOTDIR="$HOME/config/zsh"
fpath=($fpath $ZDOTDIR/functions)
typeset -U fpath
# source non-standard zshrc
. "$ZDOTDIR/zshrc"