Updates to use PS profile functions when running setup

mattgwagner · Sep 7, 2014 · 6234f8f · 6234f8f
1 parent 2fef56e
commit 6234f8f
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 57 deletions.
diff --git a/Functions.psm1 b/Functions.psm1
diff --git 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
+chocolatey install webpi
diff --git a/Install-Git.ps1 b/Install-Git.ps1
@@ -1,13 +1,13 @@
-Import-Module .\Functions
+$ScriptPath = Split-Path -Parent $MyInvocation.MyCommand.Definition
+
+& "$ScriptPath\PowerShellProfile\Microsoft.PowerShell_profile.ps1"
 
 ## Development Tools - Git
 
 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
@@ -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"
+(New-Object net.webclient).DownloadFile($url, $file)
+
+(New-Object -com shell.application).shellExecute($file)
diff --git 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
@@ -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
@@ -137,4 +137,13 @@ function Load-Assembly($assembly)
 	{
 		[System.Reflection.Assembly]::LoadWithPartialName("$assembly")
 	}
-}
+}
+
+function DownloadAndRun($url, $file)
+{
+	(New-Object net.webclient).DownloadFile($url, $file)
+
+	(New-Object -com shell.application).shellExecute($file)
+}
+
+Install-Chocolatey