fix bugs, tidy up

This commit is contained in:
Ray Elliott 2020-05-05 17:47:17 +01:00
parent b9d09fdf08
commit 462d529a58
1 changed files with 6 additions and 11 deletions

View File

@ -20,11 +20,9 @@ tar -xJvf node-"$_node_version"-"$_node_distro".tar.xz -C /usr/local/lib/nodejs
echo "PATH=/usr/local/lib/nodejs/node-$_node_version-$_node_distro/bin:$PATH" >> "$_home_dir"/.profile echo "PATH=/usr/local/lib/nodejs/node-$_node_version-$_node_distro/bin:$PATH" >> "$_home_dir"/.profile
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
echo 'deb https://dl.yarnpkg.com/debian/ stable main' | tee /etc/apt/sources.list.d/yarn.list echo 'deb https://dl.yarnpkg.com/debian/ stable main' | tee /etc/apt/sources.list.d/yarn.list
apt-get update && apt-get -y install yarn apt-get update && apt-get -y install yarn curl zsh tmux ninja-build gettext libtool libtool-bin autoconf automake cmake g++ pkg-config unzip python-pip python3-pip tig fzf
apt-get -y install ninja-build gettext libtool libtool-bin autoconf automake cmake g++ pkg-config unzip python-pip python3-pip tig fzf
cd /tmp
git clone https://github.com/neovim/neovim git clone https://github.com/neovim/neovim
cd neovim cd neovim
make CMAKE_BUILD_TYPE=Release make CMAKE_BUILD_TYPE=Release
@ -38,6 +36,8 @@ su "$_user_www" -c "git clone https://git.rayelliott.dev/dots/nvim.git $_config_
su "$_user_www" --login -c 'yarn global add neovim' su "$_user_www" --login -c 'yarn global add neovim'
su "$_user_www" --login -c 'python2 -m pip install --user --upgrade pynvim' su "$_user_www" --login -c 'python2 -m pip install --user --upgrade pynvim'
su "$_user_www" --login -c 'python3 -m pip install --user --upgrade pynvim' su "$_user_www" --login -c 'python3 -m pip install --user --upgrade pynvim'
su "$_user_www" --login -c "curl -fLo $_home_dir/nvim/autoload/plug.vim --create-dirs \
https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim"
su "$_user_www" --login -c 'nvim --headless +PlugInstall +qall' su "$_user_www" --login -c 'nvim --headless +PlugInstall +qall'
@ -51,20 +51,15 @@ else
fi fi
apt-get -y install tmux git
su "$_user_www" -c "git clone https://git.rayelliott.dev/dots/tmux.git $_config_dir/tmux" su "$_user_www" -c "git clone https://git.rayelliott.dev/dots/tmux.git $_config_dir/tmux"
su "$_user_www" -c "ln -bfs $_config_dir/tmux/tmux.conf $_home_dir/.tmux.conf" su "$_user_www" -c "ln -bfs $_config_dir/tmux/tmux.conf $_home_dir/.tmux.conf"
su "$_user_www" -c "ln -bfs /$_config_dir/tmux/tmux $_home_dir/.tmux" su "$_user_www" -c "ln -bfs /$_config_dir/tmux/tmux $_home_dir/.tmux"
su "$_user_www" -c "ln -bfs /$_config_dir/tmux/tmux.colours-base16.conf $_config_dir/tmux/tmux.colours.conf" su "$_user_www" -c "ln -bfs /$_config_dir/tmux/tmux.colours-base16.conf $_config_dir/tmux/tmux.colours.conf"
apt-get -y install zsh git su "$_user_www" -c "git clone https://git.rayelliott.dev/dots/zsh.git $_config_dir/zsh"
mkdir -p "$HOME"/.config su "$_user_www" -c "git clone https://github.com/tarjoilija/zgen.git $_config_dir/zsh/zgen"
cd "$HOME" su "$_user_www" -c "ln -bfs /var/www/.config/zsh/zshrc $_home_dir/.zshrc"
rm -Rf .config/zsh
su "$_user_www" -c 'git clone https://git.rayelliott.dev/dots/zsh.git /var/www/.config/zsh'
su "$_user_www" -c 'git clone https://github.com/tarjoilija/zgen.git /var/www/.config/zsh/zgen'
su "$_user_www" -c 'ln -bfs /var/www/.config/zsh/zshrc /var/www/.zshrc'
# set interactive shell # set interactive shell
_zsh=$(command -v zsh) _zsh=$(command -v zsh)