From 9b5b4a401d12a2ca122deb84a54b182c3d9a0cef Mon Sep 17 00:00:00 2001
From: ronivay <roni@vayrynen.info>
Date: Tue, 17 Mar 2020 10:52:14 +0200
Subject: [PATCH] fix output brainfarts from plugin installation

---
 xo-install.sh | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/xo-install.sh b/xo-install.sh
index 1373356..dc57660 100755
--- a/xo-install.sh
+++ b/xo-install.sh
@@ -241,26 +241,21 @@ function InstallXOPlugins {
 
 		if [[ "$PLUGINS" == "all" ]]; then
 			echo
-			echo -ne "${PROGRESS} Installing all available plugins as defined in PLUGINS variable"
+			echo -ne "${PROGRESS} Installing plugins"
 			find "$INSTALLDIR/xo-builds/xen-orchestra-$TIME/packages/" -maxdepth 1 -mindepth 1 -not -name "xo-server" -not -name "xo-web" -not -name "xo-server-cloud" -exec ln -sn {} "$INSTALLDIR/xo-builds/xen-orchestra-$TIME/packages/xo-server/node_modules/" \;
-			echo -e "\r${OK} Installing all available plugins as defined in PLUGINS variable"
 		else
 			echo
-			echo -ne "${PROGRESS} Installing plugins defined in PLUGINS variable"
+			echo -ne "${PROGRESS} Installing plugins"
 			local PLUGINSARRAY=($(echo "$PLUGINS" | tr ',' ' '))
 				for x in "${PLUGINSARRAY[@]}"; do
 				if [[ $(find $INSTALLDIR/xo-builds/xen-orchestra-$TIME/packages -type d -name "$x") ]]; then
 					ln -sn $INSTALLDIR/xo-builds/xen-orchestra-$TIME/packages/$x $INSTALLDIR/xo-builds/xen-orchestra-$TIME/packages/xo-server/node_modules/
-					echo -e "\r${OK} Installing plugins defined in PLUGINS variable"
-				else
-					echo -e "\r${FAIL} Installing plugins defined in PLUGINS variable"
-					echo -e "	${INFO} No $x plugin found from xen-orchestra packages, skipping"
-				continue
 				fi
 			done
 		fi
 
 		cd $INSTALLDIR/xo-builds/xen-orchestra-$TIME && yarn >/dev/null && yarn build >/dev/null
+		echo -e "\r${OK} Installing plugins"
 	else
 		echo
 		echo -e "${INFO} No plugins to install"
@@ -383,7 +378,7 @@ function InstallXO {
 	# If this isn't a fresh install, then list the upgrade the user is making.
 	if [[ ! -z "$OLD_REPO_HASH" ]]; then
 		echo
-		echo -e "${INFO}Updating xen-orchestra from '$OLD_REPO_HASH_SHORT' to '$NEW_REPO_HASH_SHORT'"
+		echo -e "${INFO} Updating xen-orchestra from '$OLD_REPO_HASH_SHORT' to '$NEW_REPO_HASH_SHORT'"
 	fi
 
 	echo