From 9012d573347b22c3859833c214e67a6637212ab6 Mon Sep 17 00:00:00 2001
From: Charles Gould <charles@gould.dev>
Date: Mon, 4 May 2020 22:50:05 -0500
Subject: [PATCH] install: run PlugInstall immediately

---
 install-brew.sh     |  2 +-
 install-symlinks.sh |  2 +-
 install.sh          | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/install-brew.sh b/install-brew.sh
index 6211984..b374783 100755
--- a/install-brew.sh
+++ b/install-brew.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Check if Homebrew is already installed
 if [ -x "$(command -v brew)" ]; then
diff --git a/install-symlinks.sh b/install-symlinks.sh
index 428341e..e9a14b1 100755
--- a/install-symlinks.sh
+++ b/install-symlinks.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 DOTFILES="$HOME/dotfiles"
 
diff --git a/install.sh b/install.sh
index 2acce4d..a95034b 100755
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 DOTFILES="$HOME/dotfiles"
 
+# Install symlinks
+"$DOTFILES/install-symlinks.sh"
+
 # Install plugin manager for Neovim, if it doesn't exist
 VIM_PLUG_SRC="https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim"
 VIM_PLUG_DST="$HOME/.local/share/nvim/site/autoload/plug.vim"
@@ -10,13 +13,10 @@ if [ ! -f "$VIM_PLUG_DST" ]; then
 	curl -fsSL -o "$VIM_PLUG_DST" --create-dirs "$VIM_PLUG_SRC"
 fi
 
-# Add Homebrew-managed shells to system list
-BREW_PREFIX=`brew --prefix`
-grep -q "$BREW_PREFIX/bin/bash" /etc/shells || echo "$BREW_PREFIX/bin/bash" | sudo tee -a /etc/shells
-grep -q "$BREW_PREFIX/bin/fish" /etc/shells || echo "$BREW_PREFIX/bin/fish" | sudo tee -a /etc/shells
+# Install plugins for Neovim
+nvim +PlugInstall +qall
 
 # Make fish the default shell
-sudo chsh -s "$BREW_PREFIX/bin/fish" `whoami`
-
-# Install symlinks
-"$DOTFILES/install-symlinks.sh"
+BREW_PREFIX=$(brew --prefix)
+grep -q "$BREW_PREFIX/bin/fish" /etc/shells || echo "$BREW_PREFIX/bin/fish" | sudo tee -a /etc/shells
+sudo chsh -s "$BREW_PREFIX/bin/fish" $(whoami)