From 15b5499ab6177e0a74638f5e7f1f49f6f9880e85 Mon Sep 17 00:00:00 2001
From: Paul Walker <paul.walker@broadcom.com>
Date: Tue, 2 Feb 2021 17:10:37 +0000
Subject: [PATCH] install: tweaking install

---
 install     | 37 ++++++++++++++++++-------------------
 install-vim |  4 ++--
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/install b/install
index 01b155d..789d870 100755
--- a/install
+++ b/install
@@ -30,6 +30,24 @@ fi
 
 cargo install delta bat exa sd
 
+GIT=$(which git)
+if [ "$GIT" != "" ] ; then
+  mkdir -p ~/src/
+  pushd ~/src/
+  if [ ! -d fd ] ; then
+    git clone https://github.com/sharkdp/fd.git
+    cd fd
+  else
+    cd fd
+    git pull
+  fi
+  cargo build --release
+  ln -sfv $PWD/target/release/fd ~/bin
+  popd
+else
+  echo "You don't have git; can't install fd and a lot of Vim plugins are going to fail too."
+fi
+
 # git-prompt
 # if [ ! -e ~/.git-prompt.sh ]; then
 #   curl https://raw.githubusercontent.com/git/git/master/contrib/completion/git-prompt.sh -o ~/.git-prompt.sh
@@ -50,29 +68,12 @@ if [ "$(uname -s)" = 'Darwin' ]; then
   [ -z "$(which brew)" ] &&
     ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 
-  # echo "Updating homebrew"
-  # brew cask install xquartz iterm2 caffeine spectacle \
-    # virtualbox virtualbox-extension-pack \
-    # vagrant mat visualvm fluid google-backup-and-sync rstudio r mactex osxfuse
-
   brew install \
     fd ag wget git bat tmux bash-completion \
     vim macvim jq
 
-    # ripgrep ant cmake cmus coreutils cscope exiftool doxygen liboauth \
-    # fish graphviz imagemagick leiningen sbt gnupg \
-    # maven ranger tree zsh jq ruby python go highlight \
-    # reattach-to-user-namespace pinentry-mac gnuplot
-
   # brew tap universal-ctags/universal-ctags
   # brew install --HEAD universal-ctags
-
-  # command -v blsd > /dev/null ||
-    # (bash <(curl -fL https://raw.githubusercontent.com/junegunn/blsd/master/install) && mv blsd ~/bin)
-
-  # Create
-  # gem install gem-ctags
-  # gem ctags
 fi
 
 git config --global user.email "paul@blacksun.org.uk"
@@ -82,8 +83,6 @@ git config --global core.pager "delta --line-numbers --dark"
 git config --global delta.side-by-side true
 # git config --global delta.syntax-theme Dracula
 git config --global delta.syntax-theme "Solarized (dark)"
-# git config --global user.signingKey FEF9C627
-# git config --global commit.gpgsign true
 
 if [ ! -d ~/.tmux/plugins/tpm ] ; then
   git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
diff --git a/install-vim b/install-vim
index 59fee95..4e69d34 100755
--- a/install-vim
+++ b/install-vim
@@ -19,8 +19,8 @@ done
 [ $(realpath ~/.vimrc) == $BASE/vimrc ] 
 if [ $? -ne 0 ] ; then
   mkdir -p bak
-  echo mv -v ~/.vimrc bak/.vimrc 2> /dev/null
-  echo ln -svf $BASE/vimrc ~/.vimrc
+  mv -v ~/.vimrc bak/.vimrc
+  ln -svf $BASE/vimrc ~/.vimrc
 fi
 
 # nvim