No longer rely on do_link, and manually install .oh-my-zsh
This commit is contained in:
parent
70b50522eb
commit
07232bb0e5
14
install/zsh
14
install/zsh
|
@ -11,7 +11,7 @@ if [ ! -d ~/.oh-my-zsh ]; then
|
||||||
|
|
||||||
# https://github.com/robbyrussell/oh-my-zsh
|
# https://github.com/robbyrussell/oh-my-zsh
|
||||||
echo_g "==> ZSH: Installing oh-my-zsh"
|
echo_g "==> ZSH: Installing oh-my-zsh"
|
||||||
curl -L https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh | sh
|
git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
|
||||||
|
|
||||||
# Set new shell
|
# Set new shell
|
||||||
echo_g "==> ZSH: Changing shell"
|
echo_g "==> ZSH: Changing shell"
|
||||||
|
@ -20,20 +20,22 @@ if [ ! -d ~/.oh-my-zsh ]; then
|
||||||
if !grep -i "$zsh_bin" /etc/shells; then
|
if !grep -i "$zsh_bin" /etc/shells; then
|
||||||
echo_r "==> ZSH: You need to add $zsh_bin to /etc/shells!"
|
echo_r "==> ZSH: You need to add $zsh_bin to /etc/shells!"
|
||||||
else
|
else
|
||||||
chsh -s $(which zsh)
|
chsh -s "$zsh_bin"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
echo_g "==> ZSH: Updating"
|
echo_g "==> ZSH: Updating"
|
||||||
cd ~/.oh-my-zsh
|
cd ~/.oh-my-zsh
|
||||||
git pull
|
git pull
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Create links
|
# Create links
|
||||||
echo_g "==> ZSH: Setting up symlinks"
|
echo_g "==> ZSH: Setting up symlinks"
|
||||||
do_link ~/.dotfiles/zsh ~/.zsh
|
ln -sf ~/.dotfiles/zsh ~/.zsh
|
||||||
do_link ~/.dotfiles/zshrc ~/.zshrc
|
ln -sf ~/.dotfiles/zshrc ~/.zshrc
|
||||||
do_link ~/.dotfiles/zshenv ~/.zshenv
|
ln -sf ~/.dotfiles/zshenv ~/.zshenv
|
||||||
do_link ~/.dotfiles/bashrc ~/.bashrc
|
ln -sf ~/.dotfiles/bashrc ~/.bashrc
|
||||||
|
|
||||||
echo_g "==> ZSH: DONE!"
|
echo_g "==> ZSH: DONE!"
|
||||||
|
|
Loading…
Reference in a new issue