Move profile setup stuff to dedicated script.

diff --git a/True b/True
new file mode 100644 (file)
index 0000000..a663d40
--- /dev/null
+++ b/True
@@ -0,0 +1 @@
+$profileContents = [string]::join([environment]::newline, (get-content -pathC:\src\dotfiles\Microsoft.PowerShell_profile.ps1));invoke-expression $profileContents\r

diff --git a/bootstrap.ps1 b/bootstrap.ps1
index 68ea146224156da608f593846ec031629b4b60b8..b96584f5e10a58f211822ebf91e8fa729352a3cf 100644 (file)
--- a/bootstrap.ps1
+++ b/bootstrap.ps1
@@ -12,52 +12,23 @@ Relies heavily on the Chocolatey package manager.
 #>
 
 param(
 #>
 
 param(

-  [Parameter(Mandatory=$true, HelpMessage="Install Development Tools")]
+  # [Parameter(Mandatory=$true, HelpMessage="Install Development Tools")]

   [switch]$dev_tools,
   [switch]$dev_tools,

-  [Parameter(Mandatory=$true, HelpMessage="Install Modeling Tools")]
+  # [Parameter(Mandatory=$true, HelpMessage="Install Modeling Tools")]

   [switch]$archi,
   [switch]$archi,

-  [Parameter(Mandatory=$true, HelpMessage="Install Vim")]
+  # [Parameter(Mandatory=$true, HelpMessage="Install Vim")]

   [switch]$vim,
   [switch]$vim,

+  # [Parameter(Mandatory=$true, HelpMessage="Setup PowerShell Profile")]
+  [switch]$profile

 )
 
 )
 

-# Setup my PowerShell Profile (on Windows)
-if(-Not(Test-Path -Path $profile)) {
-  New-Item -Path "$profile" -ItemType File
-}
-
-$sourceMeFile = "$pwd\Microsoft.PowerShell_profile.ps1"
-$sourceMeLine = '$profileContents = [string]::join([environment]::newline, (get-content -path'
-$sourceMeLine += $sourceMeFile
-$sourceMeLine += '));invoke-expression $profileContents'
-
-$doneFlagFile = "./DONE.md"
-$doBootStrap = -Not (Test-Path -Path $doneFlagFile)
-
-$profileContents = Get-Content $profile 
-if(! $profileContents -contains $sourceMeLine) {
-  Add-Content -Path $profile -Value $sourceMeLine
-}
-
-## Install Chocolatey
+## Always Install Chocolatey if missing

 $testchoco = powershell choco -v
 if(-not($testchoco)){
   Write-Output "Seems Chocolatey is not installed, installing now..."
   Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
 }
 
 $testchoco = powershell choco -v
 if(-not($testchoco)){
   Write-Output "Seems Chocolatey is not installed, installing now..."
   Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
 }
 

-# Install Python3 and Pip
-
-# Install Stub PowerShell Profile that sources the one from DotFiles
-
-# Install profile for Windows Terminal
-$destFile = "C:\Users\delaport\AppData\Local\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\profiles.json"
-if(-Not(Test-Path -Path $destFile)) {
-  Copy-Item -Path ./profiles.json -Destination $destFile
-} else {
-  # Brute force ensure we update our git copy once in awhile.
-  Copy-Item -Path $destFile -Destination ./profiles.json
-}
-

 # OWASP ZAP for web application security scanning
 if($false) {
   choco install zap
 # OWASP ZAP for web application security scanning
 if($false) {
   choco install zap


@@ -83,3 +54,7 @@ if($dev_tools){
 if($vim){
   ./install/vim.ps1
 }
 if($vim){
   ./install/vim.ps1
 }

+
+if($profile){
+  ./install/profile.ps1
+}
\ No newline at end of file

diff --git a/install/profile.ps1 b/install/profile.ps1
new file mode 100644 (file)
index 0000000..2cd28a8
--- /dev/null
+++ b/install/profile.ps1
@@ -0,0 +1,37 @@
+<#\r
+.SYNOPSIS\r
+\r
+Setup EdTheDev's PowerShell Profile\r
+\r
+.NOTES\r
+\r
+#>\r
+\r
+\r
+# Setup my PowerShell Profile (on Windows)\r
+if(-Not(Test-Path -Path $profile)) {\r
+  New-Item -Path "$profile" -ItemType File\r
+}\r
+\r
+# Install Stub PowerShell Profile that sources the one from DotFiles\r
+$sourceMeFile = "$pwd\Microsoft.PowerShell_profile.ps1"\r
+$sourceMeLine = '$profileContents = [string]::join([environment]::newline, (get-content -path'\r
+$sourceMeLine += $sourceMeFile\r
+$sourceMeLine += '));invoke-expression $profileContents'\r
+\r
+$doneFlagFile = "./DONE.md"\r
+$doBootStrap = -Not (Test-Path -Path $doneFlagFile)\r
+\r
+$profileContents = Get-Content $profile \r
+if(! $profileContents -contains $sourceMeLine) {\r
+  Add-Content -Path $profile -Value $sourceMeLine\r
+}\r
+\r
+# Install profile for Windows Terminal\r
+# $destFile = "C:\Users\delaport\AppData\Local\Packages\Microsoft.WindowsTerminal_8wekyb3d8bbwe\LocalState\profiles.json"\r
+# if(-Not(Test-Path -Path $destFile)) {\r
+#  Copy-Item -Path ./profiles.json -Destination $destFile\r
+# } else {\r
+#  # Brute force ensure we update our git copy once in awhile.\r
+#  Copy-Item -Path $destFile -Destination ./profiles.json\r
+#}\r