From 47b3f8f563a3f669d4239ac9e85898d152cfe5c8 Mon Sep 17 00:00:00 2001
From: JustArchi <JustArchi@JustArchi.net>
Date: Mon, 13 Nov 2017 02:13:29 +0100
Subject: [PATCH] Closes #696

---
 cc.sh | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/cc.sh b/cc.sh
index 8a3890ddd..33d67e351 100755
--- a/cc.sh
+++ b/cc.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 set -eu
 
-SOLUTION="ArchiSteamFarm.sln"
+MAIN_PROJECT="ArchiSteamFarm"
+TESTS_PROJECT="${MAIN_PROJECT}.Tests"
+SOLUTION="${MAIN_PROJECT}.sln"
 CONFIGURATION="Release"
 OUT="out/source"
 
-PROJECTS=("ArchiSteamFarm")
-
 CLEAN=0
 TEST=1
 
@@ -22,10 +22,6 @@ for ARG in "$@"; do
 	esac
 done
 
-if [[ "$TEST" -eq 1 ]]; then
-	PROJECTS+=("ArchiSteamFarm.Tests")
-fi
-
 trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM
 
 if ! hash dotnet 2>/dev/null; then
@@ -44,19 +40,26 @@ if [[ ! -f "$SOLUTION" ]]; then
 	exit 1
 fi
 
-if [[ "$CLEAN" -eq 1 ]]; then
-	dotnet clean "${PROJECTS[@]}" -c "$CONFIGURATION" -o "$OUT"
-
-	for PROJECT in "${PROJECTS[@]}"; do
-		rm -rf "${PROJECT:?}/${OUT}"
-	done
-fi
-
-dotnet restore
-dotnet build "${PROJECTS[@]}" -c "$CONFIGURATION" -o "$OUT" --no-restore /nologo
+SETUP_FLAGS=(-c "$CONFIGURATION" -o "$OUT")
+BUILD_FLAGS=(--no-restore /nologo)
 
 if [[ "$TEST" -eq 1 ]]; then
-	dotnet test ArchiSteamFarm.Tests -c "$CONFIGURATION" -o "$OUT" --no-build --no-restore
+	if [[ "$CLEAN" -eq 1 ]]; then
+		dotnet clean "${SETUP_FLAGS[@]}"
+		rm -rf "${MAIN_PROJECT:?}/${OUT}" "${TESTS_PROJECT:?}/${OUT}"
+	fi
+
+	dotnet restore
+	dotnet build "${SETUP_FLAGS[@]}" "${BUILD_FLAGS[@]}"
+	dotnet test "$TESTS_PROJECT" "${SETUP_FLAGS[@]}" "${BUILD_FLAGS[@]}" --no-build
+else
+	if [[ "$CLEAN" -eq 1 ]]; then
+		dotnet clean "$MAIN_PROJECT" "${SETUP_FLAGS[@]}"
+		rm -rf "${MAIN_PROJECT:?}/${OUT}"
+	fi
+
+	dotnet restore "$MAIN_PROJECT"
+	dotnet build "$MAIN_PROJECT" "${SETUP_FLAGS[@]}" "${BUILD_FLAGS[@]}"
 fi
 
 echo