From: Edward Delaporte <delaport@illinois.edu>
Date: Mon, 15 Mar 2021 16:43:56 +0000 (-0500)
Subject: Merging cross platform changes.
X-Git-Url: https://us-delaporte.pagekite.me/gitweb/dotfiles.git/commitdiff_plain/e3b2c2dc5ef49fa1a29fd237c931972cf7b067ef?hp=--cc

Merging cross platform changes.
---

e3b2c2dc5ef49fa1a29fd237c931972cf7b067ef
diff --cc Microsoft.PowerShell_profile.ps1
index 7acc0d2,69c720d..31b22ad
--- a/Microsoft.PowerShell_profile.ps1
+++ b/Microsoft.PowerShell_profile.ps1
@@@ -8,24 -8,34 +8,40 @@@
  #}
  # $env:PSModulePath = $env:PSModulePath.Replace("\\ad.uillinois.edu\techsvc\home\$($ENV:USERNAME)\Documents\PowerShell\Modules;",'')
  
+ # No longer needed in PowerShell 7
 -# if($IsWindows -eq "") {
 -# 	# Bootstrap for older PowerShell
 -# 	$IsWindows = ($env:OS -eq "Windows_NT")
 -# }
 -
 -#if($IsWindows){
 -#	# Some Paths that are annoying to find/restore if the installer fails
 -#	$ENV:PATH+=";C:\Program Files\Microsoft VS Code\bin" # One Editor to rule them all
 -#	$ENV:PATH+=";C:\Program Files\Git\cmd" # Version control is nice.
 -#	$ENV:PATH+=";C:\ProgramData\chocolatey\bin" # Package management is nice.
 -#	$ENV:PATH+=";C:\PENGUIN" # Flag to ensure my profile kicked in.
 -#}
 +if($IsWindows -eq "") {
- 	# Bootstrap for older PowerShell
- 	$IsWindows = ($env:OS -eq "Windows_NT")
++ 	# Bootstrap for older PowerShell
++	Write-Host "***Bootstrapped Is Windows for older PowerShell***"
++ 	$IsWindows = ($env:OS -eq "Windows_NT")
++}
+ 
 -$env:Journal = "~\Journal\2021" # allows cd $env:journal
++$env:src = "~"
++if($IsWindows){
++	Write-Host "***Is Windows***"
++  $env:src = "c:\src"
++}
+ 
 -$src = "~"
+ if($IsWindows){
 -  $src = "c:\src"
++	# Some Paths that are annoying to find/restore if the installer fails
++	$ENV:PATH+=";C:\Program Files\Microsoft VS Code\bin" # One Editor to rule them all
++	$ENV:PATH+=";C:\Program Files\Git\cmd" # Version control is nice.
++	$ENV:PATH+=";C:\ProgramData\chocolatey\bin" # Package management is nice.
++	$ENV:PATH+=";C:\PENGUIN" # Flag to ensure my profile kicked in.
  }
  
- #if($IsWindows){
- #	# Some Paths that are annoying to find/restore if the installer fails
- #	$ENV:PATH+=";C:\Program Files\Microsoft VS Code\bin" # One Editor to rule them all
- #	$ENV:PATH+=";C:\Program Files\Git\cmd" # Version control is nice.
- #	$ENV:PATH+=";C:\ProgramData\chocolatey\bin" # Package management is nice.
- #	$ENV:PATH+=";C:\PENGUIN" # Flag to ensure my profile kicked in.
- #}
 +
 +$env:Journal = "~\Journal\2021" # allows cd $env:journal
++$env:minion = "$env:src\minion"
 +
  # Import some home grown PowerShell modules, if they are installed.
- $modPaths = Get-Childitem -Path "c:\src\dotfiles\psmodules"
- $modPaths += Get-Childitem -Path "c:\src\minion\psmodule"
+ #
 -$modPaths = Get-Childitem -Path "$src\dotfiles\psmodules"
 -$modPaths += Get-Childitem -Path "$src\minion\psmodule"
++$modPaths = Get-Childitem -Path "$env:src\dotfiles\psmodules"
++$modPaths += Get-Childitem -Path "$env:minion\psmodule"
++
++# Windows Only Modules
+ if($IsWindows){
 -	$modPaths += Get-Childitem -Path "$src\dotfiles\win_psmodules"
++	$modPaths += Get-Childitem -Path "$env:src\dotfiles\win_psmodules"
+ }
  if($modPaths.length -eq 0){
  	Write-Host "No modules found."
  }
@@@ -34,19 -44,22 +50,22 @@@ $modPaths | ForEach-Object 
  	Import-Module $fileName
  	Write-Host ">> Loaded $fileName"
  }
- #}
- # $env:PSModulePath = $env:PSModulePath + ";c:\src\dotfiles\psmodules"
+ 
 -# $env:PSModulePath = $env:PSModulePath + ";$src\dotfiles\psmodules"
 -
 -# Windows Only Modules
  
  
  # Linux-like up/down in shell
  Set-PSReadlineKeyHandler -Key UpArrow -Function HistorySearchBackward 
  Set-PSReadlineKeyHandler -Key DownArrow -Function HistorySearchForward 
- Set-PSReadlineOption -HistorySavePath c:\temp\PSHistory.log
 -Set-PSReadlineOption -HistorySavePath $src\PSHistory.log
++Set-PSReadlineOption -HistorySavePath $env:src\PSHistory.log
  
  # Minion alias commands - 'today'
- . C:\src\minion\profiles\alias.ps1
 -. $src\minion\profiles\alias.ps1
++# . C:\src\minion\profiles\alias.ps1
++. $env:minion\profiles\alias.ps1
 +# Add Minion go executable to path.
- . C:\src\minion\profiles\path.ps1
++. $env:minion\profiles\path.ps1
+ # Add Minion to path
+ Write-Host "+ Added minion command to path."
 -$ENV:PATH+=";$src\minion\go" # Flag to ensure my profile kicked in.
++$ENV:PATH+=";$env:minion\go" # Flag to ensure my profile kicked in.
  
  # Unix dies hard.
  New-Alias which get-command
@@@ -60,5 -73,5 +79,5 @@@ Write-Host "+ Type 'pg' to enable PoshG
  
  
  if((Get-Location).Path -eq $HOME){
- 	cd c:\src
 -	cd $src
++	cd $env:src
  }