From 804f6800d28ca38e17b1c36c0a852207953b240f Mon Sep 17 00:00:00 2001
From: Paul Trowbridge <paul@hptrow.me>
Date: Fri, 12 Mar 2021 21:53:04 -0500
Subject: [PATCH] break out installation pieces and layer powerline go inside
 of go install

---
 setup.sh | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/setup.sh b/setup.sh
index 3c0326a..ff0005f 100755
--- a/setup.sh
+++ b/setup.sh
@@ -32,14 +32,14 @@ done
 
 #----------------------------------------------------------install  go and go-powerline--------------------------------------------------------------------
 
+# if $GOPATH is null the prompt for golang install
 if [ -z "$GOPATH" ]
 then
     while true; do
-        read -p "do you want to install golang and go-powerline?" yn
+        read -p "do you want to install golang (needed for go-powerline)?" yn
         case $yn in
             [Yy]* ) 
                 sudo apt-get install golang -y;
-                go get -u github.com/justjanne/powerline-go;
                 break;;
             [Nn]* ) 
                 exit;;
@@ -50,13 +50,13 @@ fi
 
 #----------------------------------------------------------install  go-powerline---------------------------------------------------------------------------
 
-if [ -z "$GOPATH" ]
+# see if this file exists, if not prompt for install
+if [ ! -f ~/go/bin/powerline-go ]
 then
     while true; do
-        read -p "do you want to install golang and go-powerline?" yn
+        read -p "do you want to install go-powerline?" yn
         case $yn in
             [Yy]* ) 
-                sudo apt-get install golang -y;
                 go get -u github.com/justjanne/powerline-go;
                 break;;
             [Nn]* ) 
@@ -65,12 +65,13 @@ then
         esac
     done
 fi
+
 #----------------------------------------------------------install power line fonts------------------------------------------------------------------------
 
 if [ ! -d ~/fonts ]
 then
     while true; do
-        read -p "do you want to install powerline fonts from https://github.com/powerline/fonts?" yn
+        read -p "do you want to install powerline fonts from 'https://github.com/powerline/fonts' ?" yn
         case $yn in
             [Yy]* ) 
                 git clone https://github.com/powerline/fonts ~/fonts;
@@ -90,7 +91,7 @@ fi
 if [ ! -d ~/.tmux/plugins/tpm ]
 then
     while true; do
-        read -p "do you want to install the tmux plugin manager from https://github.com/tmux-plugins/tpm" yn
+        read -p "do you want to install the tmux plugin manager from 'https://github.com/tmux-plugins/tpm' ?" yn
         case $yn in
             [Yy]* ) 
                 git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm;
@@ -105,14 +106,24 @@ fi
 
 #----------------------------------------------------------see if Vundle has been cloned yet and do so-----------------------------------------------------
 
-if [ ! -d ~/.vim ]
+if [ ! -d ~/.vim/bundle ]
 then
-    git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
     while true; do
-        read -p "Do you want to install the vim plugins now?" yn
+        read -p "do you want to install the Vundle plugin manager for vim from https://github.com/VundleVim/Vundle.vim.git?" yn
         case $yn in
-            [Yy]* ) vim +PluginInstall +qall; break;;
-            [Nn]* ) exit;;
+            [Yy]* )
+                git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
+                break;;
+            [Nn]* )
+                while true; do
+                    read -p "Do you want to install the vim plugins now?" yn
+                    case $yn in
+                        [Yy]* ) vim +PluginInstall +qall; break;;
+                        [Nn]* ) exit;;
+                        * ) echo "Please answer yes or no.";;
+                    esac
+                done
+                exit;;
             * ) echo "Please answer yes or no.";;
         esac
     done