From eed9af88f54cbd6bd24a1123f1ce9b51dcfaef4c Mon Sep 17 00:00:00 2001
From: Taryn Hill <taryn@phrohdoh.com>
Date: Sat, 26 Aug 2017 09:44:51 -0500
Subject: [PATCH] Always use noget in fetch-thirdparty-deps.sh

---
 thirdparty/fetch-thirdparty-deps.sh | 37 ++++++++++-------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/thirdparty/fetch-thirdparty-deps.sh b/thirdparty/fetch-thirdparty-deps.sh
index d13e8b83c3..c7a9537bc5 100755
--- a/thirdparty/fetch-thirdparty-deps.sh
+++ b/thirdparty/fetch-thirdparty-deps.sh
@@ -13,50 +13,37 @@ download_dir="${0%/*}/download"
 mkdir -p "${download_dir}"
 cd "${download_dir}"
 
-# https://github.com/travis-ci/travis-ci/issues/3940
-if [ ! $TRAVIS ] && which nuget >/dev/null 2>&1; then
-	get()
-	{
-		nuget install "$1" -Version "$2" -ExcludeVersion -Verbosity quiet
-	}
-else
-	get()
-	{
-		../noget.sh "$1" "$2"
-	}
-fi
-
 if [ ! -f StyleCopPlus.dll ]; then
 	echo "Fetching StyleCopPlus from NuGet"
-	get StyleCopPlus.MSBuild 4.7.49.5
+	../noget.sh StyleCopPlus.MSBuild 4.7.49.5
 	cp ./StyleCopPlus.MSBuild/tools/StyleCopPlus.dll .
 	rm -rf StyleCopPlus.MSBuild
 fi
 
 if [ ! -f StyleCop.dll ]; then
 	echo "Fetching StyleCop files from NuGet"
-	get StyleCop.MSBuild 4.7.49.0
+	../noget.sh StyleCop.MSBuild 4.7.49.0
 	cp ./StyleCop.MSBuild/tools/StyleCop*.dll .
 	rm -rf StyleCop.MSBuild
 fi
 
 if [ ! -f ICSharpCode.SharpZipLib.dll ]; then
 	echo "Fetching ICSharpCode.SharpZipLib from NuGet"
-	get SharpZipLib 0.86.0
+	../noget.sh SharpZipLib 0.86.0
 	cp ./SharpZipLib/lib/20/ICSharpCode.SharpZipLib.dll .
 	rm -rf SharpZipLib
 fi
 
 if [ ! -f MaxMind.Db.dll ]; then
 	echo "Fetching MaxMind.Db from NuGet"
-	get MaxMind.Db 2.0.0 -IgnoreDependencies
+	../noget.sh MaxMind.Db 2.0.0 -IgnoreDependencies
 	cp ./MaxMind.Db/lib/net45/MaxMind.Db.* .
 	rm -rf MaxMind.Db
 fi
 
 if [ ! -f SharpFont.dll ]; then
 	echo "Fetching SharpFont from NuGet"
-	get SharpFont 4.0.1
+	../noget.sh SharpFont 4.0.1
 	cp ./SharpFont/lib/net45/SharpFont* .
 	cp ./SharpFont/config/SharpFont.dll.config .
 	rm -rf SharpFont SharpFont.Dependencies
@@ -64,14 +51,14 @@ fi
 
 if [ ! -f nunit.framework.dll ]; then
 	echo "Fetching NUnit from NuGet"
-	get NUnit 3.0.1
+	../noget.sh NUnit 3.0.1
 	cp ./NUnit/lib/net40/nunit.framework* .
 	rm -rf NUnit
 fi
 
 if [ ! -f nunit3-console.exe ]; then
 	echo "Fetching NUnit.Console from NuGet"
-	get NUnit.Console 3.0.1
+	../noget.sh NUnit.Console 3.0.1
 	cp -R ./NUnit.Console/tools/* .
 	chmod +x nunit3-console.exe
 	rm -rf NUnit.Console
@@ -79,7 +66,7 @@ fi
 
 if [ ! -f Open.Nat.dll ]; then
 	echo "Fetching Open.Nat from NuGet"
-	get Open.Nat 2.1.0
+	../noget.sh Open.Nat 2.1.0
 	if [ -d ./Open.NAT ]; then mv Open.NAT Open.Nat; fi
 	cp ./Open.Nat/lib/net45/Open.Nat.dll .
 	rm -rf Open.Nat
@@ -87,7 +74,7 @@ fi
 
 if [ ! -f FuzzyLogicLibrary.dll ]; then
 	echo "Fetching FuzzyLogicLibrary from NuGet."
-	get FuzzyLogicLibrary 1.2.0
+	../noget.sh FuzzyLogicLibrary 1.2.0
 	cp ./FuzzyLogicLibrary/bin/Release/FuzzyLogicLibrary.dll .
 	rm -rf FuzzyLogicLibrary
 fi
@@ -111,14 +98,14 @@ fi
 
 if [ ! -f SmarIrc4net.dll ]; then
 	echo "Fetching SmartIrc4net from NuGet."
-	get SmartIrc4net 0.4.5.1
+	../noget.sh SmartIrc4net 0.4.5.1
 	cp ./SmartIrc4net/lib/net40/SmarIrc4net* .
 	rm -rf SmartIrc4net
 fi
 
 if [ ! -f rix0rrr.BeaconLib.dll ]; then
 	echo "Fetching rix0rrr.BeaconLib from NuGet."
-	get rix0rrr.BeaconLib 1.0.1
+	../noget.sh rix0rrr.BeaconLib 1.0.1
 	cp ./rix0rrr.BeaconLib/lib/net40/rix0rrr.BeaconLib.dll .
 	rm -rf rix0rrr.BeaconLib
-fi
\ No newline at end of file
+fi