From 6234f8f559c5b3d206acea79644f4e78d59b6632 Mon Sep 17 00:00:00 2001
From: Matt Wagner <mattgwagner@gmail.com>
Date: Sun, 7 Sep 2014 15:13:16 -0400
Subject: [PATCH] Updates to use PS profile functions when running setup

---
 Functions.psm1                                | 14 -------
 Install-DotNetDev.ps1                         | 42 ++++---------------
 Install-Git.ps1                               |  6 +--
 Install-Plex.ps1                              |  7 +++-
 Install-PyDev.ps1                             |  4 +-
 Install-RubyDev.ps1                           |  4 +-
 .../Microsoft.PowerShell_profile.ps1          | 11 ++++-
 7 files changed, 31 insertions(+), 57 deletions(-)
 delete mode 100644 Functions.psm1

diff --git a/Functions.psm1 b/Functions.psm1
deleted file mode 100644
index 84c5577..0000000
--- a/Functions.psm1
+++ /dev/null
@@ -1,14 +0,0 @@
-function DownloadAndRun($url, $file)
-{
-	(New-Object net.webclient).DownloadFile($url, $file)
-
-	(New-Object -com shell.application).shellExecute($file)
-}
-
-if(-not $env:ChocolateyInstall -or -not (Test-Path "$env:ChocolateyInstall"))
-{
-	Write-Host "Chocolatey Not Found, Installing..."
-	iex ((new-object net.webclient).DownloadString('http://chocolatey.org/install.ps1')) 
-}
-
-Export-ModuleMember -Function @('DownloadAndRun')
\ No newline at end of file
diff --git a/Install-DotNetDev.ps1 b/Install-DotNetDev.ps1
index edf1c1e..dc078c4 100644
--- a/Install-DotNetDev.ps1
+++ b/Install-DotNetDev.ps1
@@ -1,40 +1,12 @@
-Import-Module .\Functions
+$ScriptPath = Split-Path -Parent $MyInvocation.MyCommand.Definition
 
-## Development Tools - .NET
+& "$ScriptPath\PowerShellProfile\Microsoft.PowerShell_profile.ps1"
 
-cinst DotNet4.0
-cinst DotNet4.5
+chocolatey install VisualStudio2013Professional -InstallArguments "/Features:'WebTools'"
 
-## Should figure out if I want the "whole" VS or just the express edition
-## cinst VisualStudio2013ExpressWeb
-cinst VisualStudio2013Professional -InstallArguments "WebTools"
+chocolatey install SQLManagementStudio -source webpi
 
-## WebPI is clutch for installing other tooling
-cinst webpi
-cinst webpicommandline
+chocolatey install IIS-WebServerRole -source windowsfeatures
+chocolatey install IIS-ASPNET45 -source windowsfeatures
 
-## Install SQL Server tooling
-cinst SQLManagementStudio -source webpi
-cinst SQLExpressTools -source webpi
-
-## IIS Configuration
-
-cinst IIS-WebServerRole -source windowsfeatures
-
-cinst ASPNET -source webpi
-cinst ASPNET_REGIIS -source webpi
-cinst DefaultDocument -source webpi
-cinst DynamicContentCompression -source webpi
-cinst HTTPRedirection -source webpi
-cinst IIS7_ExtensionLessURLs -source webpi
-cinst IISExpress -source webpi
-cinst IISExpress_7_5 -source webpi
-cinst IISManagementConsole -source webpi
-cinst ISAPIExtensions -source webpi
-cinst ISAPIFilters -source webpi
-cinst NETExtensibility -source webpi
-cinst RequestFiltering -source webpi
-cinst StaticContent -source webpi
-cinst StaticContentCompression -source webpi
-cinst UrlRewrite2 -source webpi
-cinst WindowsAuthentication -source webpi
\ No newline at end of file
+chocolatey install webpi
\ No newline at end of file
diff --git a/Install-Git.ps1 b/Install-Git.ps1
index 9859217..ab335e2 100644
--- a/Install-Git.ps1
+++ b/Install-Git.ps1
@@ -1,4 +1,6 @@
-Import-Module .\Functions
+$ScriptPath = Split-Path -Parent $MyInvocation.MyCommand.Definition
+
+& "$ScriptPath\PowerShellProfile\Microsoft.PowerShell_profile.ps1"
 
 ## Development Tools - Git
 
@@ -6,8 +8,6 @@ cinst githubforwindows
 
 cinst TortoiseGit
 
-cinst poshgit
-
 ## Create a new PowerShell Profile
 if (!(test-path $profile)) 
 {
diff --git a/Install-Plex.ps1 b/Install-Plex.ps1
index 9e9172d..bc5961f 100644
--- a/Install-Plex.ps1
+++ b/Install-Plex.ps1
@@ -1,3 +1,6 @@
-Import-Module .\Functions
+$url = "http://ninite.com/plex/ninite.exe"
+$file = "plex.exe"
 
-DownloadAndRun "http://ninite.com/plex/ninite.exe" "plex.exe"
\ No newline at end of file
+(New-Object net.webclient).DownloadFile($url, $file)
+
+(New-Object -com shell.application).shellExecute($file)
\ No newline at end of file
diff --git a/Install-PyDev.ps1 b/Install-PyDev.ps1
index 73f70f0..b570b07 100644
--- a/Install-PyDev.ps1
+++ b/Install-PyDev.ps1
@@ -1,4 +1,6 @@
-Import-Module .\Functions
+$ScriptPath = Split-Path -Parent $MyInvocation.MyCommand.Definition
+
+& "$ScriptPath\PowerShellProfile\Microsoft.PowerShell_profile.ps1"
 
 ## Development Tools - Python
 
diff --git a/Install-RubyDev.ps1 b/Install-RubyDev.ps1
index 5ce97df..e82d8db 100644
--- a/Install-RubyDev.ps1
+++ b/Install-RubyDev.ps1
@@ -1,4 +1,6 @@
-Import-Module .\Functions
+$ScriptPath = Split-Path -Parent $MyInvocation.MyCommand.Definition
+
+& "$ScriptPath\PowerShellProfile\Microsoft.PowerShell_profile.ps1"
 
 ## Development Tools - Ruby
 
diff --git a/PowerShellProfile/Microsoft.PowerShell_profile.ps1 b/PowerShellProfile/Microsoft.PowerShell_profile.ps1
index a662470..70388e4 100644
--- a/PowerShellProfile/Microsoft.PowerShell_profile.ps1
+++ b/PowerShellProfile/Microsoft.PowerShell_profile.ps1
@@ -137,4 +137,13 @@ function Load-Assembly($assembly)
 	{
 		[System.Reflection.Assembly]::LoadWithPartialName("$assembly")
 	}
-}
\ No newline at end of file
+}
+
+function DownloadAndRun($url, $file)
+{
+	(New-Object net.webclient).DownloadFile($url, $file)
+
+	(New-Object -com shell.application).shellExecute($file)
+}
+
+Install-Chocolatey
\ No newline at end of file