From 6f76070a02e0c8320cd473c5c8a70c42bd520f7e Mon Sep 17 00:00:00 2001
From: Sage Vaillancourt <sagev9000@tutanota.com>
Date: Sat, 26 Aug 2023 00:44:39 -0400
Subject: [PATCH] Clean up install output

---
 copy.sh | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/copy.sh b/copy.sh
index cfe9bab..28f8a54 100755
--- a/copy.sh
+++ b/copy.sh
@@ -25,9 +25,11 @@ if [[ "$1" == "--files-only" ]]; then
   exit 0
 fi
 
-# Install required packages
+echo
+echo "Installing required packages..."
+
 echo -n "Rust is "
-if ! command -v cargo; then
+if ! command -v cargo &> /dev/null; then
   echo "not installed. Installing..."
   curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
 else
@@ -35,11 +37,11 @@ else
 fi
 
 . "$HOME/.cargo/env"
-if command -v cargo && ! command -v bat; then
+if command -v cargo &> /dev/null && ! command -v bat &> /dev/null; then
   cargo install bat
 fi
 
-echo "nvm is "
+echo -n "nvm is "
 if ! test -d "$HOME/.nvm"; then
   echo "not installed. Installing..."
   curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash
@@ -54,8 +56,8 @@ else
   echo "already installed."
 fi
 
-echo "dotnet is "
-if ! command -v dotnet; then
+echo -n "dotnet is "
+if ! command -v dotnet &> /dev/null; then
   echo "not installed. Installing..."
   wget https://dot.net/v1/dotnet-install.sh -O /tmp/dotnet-install.sh
   chmod +x /tmp/dotnet-install.sh
@@ -65,8 +67,8 @@ else
   echo "already installed."
 fi
 
-echo "starship is "
-if ! command -v starship; then
+echo -n "starship is "
+if ! command -v starship &> /dev/null; then
   echo "not installed. Installing..."
 curl -sS https://starship.rs/install.sh | sh
 echo "Starship requires an NFont: https://github.com/ryanoasis/nerd-fonts/releases/download/v2.1.0/FiraCode.zip"
@@ -74,8 +76,8 @@ else
   echo "already installed."
 fi
 
-echo "JetBrains toolbox is "
-if ! test -f $HOME/.config/JetBrains/; then
+echo -n "JetBrains toolbox is "
+if ! test -d $HOME/.config/JetBrains/; then
   echo "not installed. Installing..."
   ARCHIVE_URL="$(curl -s 'https://data.services.jetbrains.com/products/releases?code=TBA&latest=true&type=release' | grep -Po '"linux":.*?[^\\]",' | awk -F ':' '{print $3,":"$4}'| sed 's/[", ]//g')"
   wget -q --show-progress -cO "/tmp/jetbrains-toolbox-latest.tar.gz" "$ARCHIVE_URL"
@@ -87,4 +89,6 @@ else
   echo "already installed."
 fi
 
-echo "You may wish to install fzf for sofi and other search"
+if ! command -v fzf &> /dev/null; then
+  echo "You may wish to install fzf for sofi and other search"
+fi